From f14d67c8f224a7d109ef5207dd1119bff1959894 Mon Sep 17 00:00:00 2001
From: Maksim <18454392+silentdigit@users.noreply.github.com>
Date: Mon, 23 Dec 2019 21:59:00 +1100
Subject: [PATCH] updated docker build ci

---
 ...{docker-autobuild.yml => docker-build.yml} | 26 ++++++++++++-------
 Dockerfile                                    |  6 +++++
 2 files changed, 22 insertions(+), 10 deletions(-)
 rename .github/workflows/{docker-autobuild.yml => docker-build.yml} (63%)

diff --git a/.github/workflows/docker-autobuild.yml b/.github/workflows/docker-build.yml
similarity index 63%
rename from .github/workflows/docker-autobuild.yml
rename to .github/workflows/docker-build.yml
index ae4d492..bbd4bdb 100755
--- a/.github/workflows/docker-autobuild.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,13 +1,14 @@
-name: Docker Image CI
+name: docker build
 
 on: [push]
 
 env:
   USERNAME: silentdigit
   PROJECT: letsencrypt
+  PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64
+  MB_HOOK: https://hooks.microbadger.com/images/silentdigit/letsencrypt/_6yxWTBCiLrWUo_G3PCewhwxrVo=
 
 jobs:
-  
   buildx:
     name: Build Multi-Platform Image and Upload to Docker Hub
     runs-on: ubuntu-latest
@@ -41,14 +42,19 @@ jobs:
         env:
           DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
         run: |
-          # Variables
+          # Login
+          docker login -u "$USERNAME" -p "$DOCKER_TOKEN"
+
+          # Setup build parameters
+          BUILD_PARAMS="--platform="$PLATFORMS" --build-arg VCS_REF=$(git rev-parse --short HEAD) --push"
+
+          # Build image as tagged version
           TAG=$(date +%y.%m)
-
-          #Login
-          docker login -u ${USERNAME} -p ${DOCKER_TOKEN}
-
-          # Build image as TAG version
-          docker buildx build -t ${USERNAME}/${PROJECT}:${TAG} --platform=linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x --push .
+          docker buildx build -t "$USERNAME"/"$PROJECT":"$TAG" $BUILD_PARAMS .
 
           # Build image as latest version
-          docker buildx build -t ${USERNAME}/${PROJECT}:latest --platform=linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x --push .
+          TAG=latest
+          docker buildx build -t "$USERNAME"/"$PROJECT":"$TAG" $BUILD_PARAMS .
+
+          # Update MicroBadger metadata
+          curl -X POST "$MB_HOOK"
diff --git a/Dockerfile b/Dockerfile
index a8ce49b..c507d5f 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,12 @@
 # Base image
 FROM alpine:latest
 
+# Maintainer information
+ARG VCS_REF
+LABEL maintainer="Maksim Stojkovic <https://github.com/silentdigit>" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url="https://github.com/silentdigit/docker-letsencrypt"
+
 # Install tools required
 RUN apk --no-cache add certbot curl