Merge pull request #11 from chentex/release-build

Adds build step for tagged image

.github/workflows/pr.yml

@@ -17,10 +17,7 @@ jobs:
           IMAGE_NAME="docker.io/chentex/random-logger"
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=image::${IMAGE_NAME}
-          docker build --build-arg VCS_REF="$(git rev-parse --short HEAD)" \
-          --build-arg BUILD_DATE="$(date -u +'%Y-%m-%dT%H:%M:%SZ')" \
-          --build-arg VERSION="$VERSION" \
-          -f Dockerfile -t "$IMAGE_NAME":"$VERSION" .
+          docker build -f Dockerfile -t "$IMAGE_NAME":"$VERSION" .
 
       - name: Scan for vulnerabilities
         uses: aquasecurity/trivy-action@master

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       - 'v*.*.*'
 jobs:
   docker:
-    name: Build and check for vulnerabilities
+    name: Build and release
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout code
@@ -47,4 +47,23 @@ jobs:
         uses: docker/login-action@v1 
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/386
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: |
+            org.opencontainers.image.title=${{ fromJson(steps.repo.outputs.result).name }}
+            org.opencontainers.image.description=${{ fromJson(steps.repo.outputs.result).description }}
+            org.opencontainers.image.url=${{ fromJson(steps.repo.outputs.result).html_url }}
+            org.opencontainers.image.source=${{ fromJson(steps.repo.outputs.result).clone_url }}
+            org.opencontainers.image.version=${{ steps.prep.outputs.version }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.licenses=${{ fromJson(steps.repo.outputs.result).license.spdx_id }}

Dockerfile

@@ -1,11 +1,4 @@
 FROM alpine:3.12
-ARG BUILD_DATE
-ARG VCS_REF
-ARG VERSION
-LABEL org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/chentex/random-logger" \
-      org.label-schema.version=$VERSION
 RUN apk add --no-cache bc
 COPY ./entrypoint.sh /
 ENTRYPOINT ["/entrypoint.sh"]