Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ jobs:
- name: Build the Docker image
env:
# @see https://docs.docker.com/develop/develop-images/build_enhancements/
COMPOSE_DOCKER_CLI_BUILD: "1"
DOCKER_BUILDKIT: "1"
run: |
docker build . \
--cache-from macbre/index-digest:latest \
--build-arg COMMIT_SHA=$(git rev-parse --short HEAD) \
--cache-from ghcr.io/macbre/index-digest:latest \
--build-arg BUILDKIT_INLINE_CACHE=1 \
--build-arg GITHUB_SHA=$(git rev-parse --short HEAD) \
--tag ${{ github.repository }}

docker images

echo "## Image labels:"
Expand Down
9 changes: 2 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@ RUN apk upgrade \
&& rm -rf /root/.cache \
&& apk del build-deps

ARG COMMIT_SHA="dev"
ENV COMMIT_SHA ${COMMIT_SHA}

# label the image with branch name and commit hash
LABEL maintainer="maciej.brencz@gmail.com"
LABEL org.opencontainers.image.source="https://github.com/macbre/index-digest"
LABEL org.opencontainers.image.revision="${COMMIT_SHA}"
ARG GITHUB_SHA="dev"
ENV COMMIT_SHA ${GITHUB_SHA}

# install the remaining files
ADD . .
Expand Down
3 changes: 0 additions & 3 deletions hooks/build

This file was deleted.