Merge pull request #257 from macbre/label-via-action

Dockerfile: labelling happens in the action that builds and publishes an image

Author: macbre

.github/workflows/dockerimage.yml

@@ -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:"

Dockerfile

@@ -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="[email protected]"
-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 . .