feat: support building arm64 images

Author: bodom0015

.github/workflows/docker.yml

@@ -1,15 +1,16 @@
 name: Docker
 
 # This will run when:
-# - when new code is pushed to master/develop to push the tags
+# - when new code is pushed to main/develop to push the tags
 #   latest and develop
 # - when a pull request is created and updated  to make sure the
 #   Dockerfile is still valid.
-# To be able to push to dockerhub, this execpts the following
+# To be able to push to dockerhub, this expects the following
 # secrets to be set in the project:
 # - DOCKERHUB_USERNAME : username that can push to the org
 # - DOCKERHUB_PASSWORD : password asscoaited with the username
 on:
+  # Trigger a build for every new push to the main branch
   push:
     branches:
       - master
@@ -18,112 +19,54 @@ on:
 
   pull_request:
 
-  # Trigger the workflow on release activity
+  # Trigger a build for every new release
   release:
-    # Only use the types keyword to narrow down the activity types that will trigger your workflow.
     types:
       - published
       - edited
       - created
 
-# Certain actions will only run when this is the master repo.
+# Certain actions will only run when this is the main repo.
 env:
-  MASTER_REPO: nds-org/workbench-apiserver-python
+  MAIN_REPO: nds-org/workbench-apiserver-python
   DOCKERHUB_ORG: ndslabs
 
 jobs:
   docker:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        name:
-          - api
-        include:
-          - name: api
-            FOLDER: .
-            IMAGE: apiserver
-
     steps:
-      - uses: actions/checkout@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
 
-      # calculate some variables that are used later
-      - name: github branch
-        run: |
-          if [ "${{ github.event.release.target_commitish }}" != "" ]; then
-            BRANCH="${{ github.event.release.target_commitish }}"
-          else
-            BRANCH=${GITHUB_REF##*/}
-          fi
-          echo "GITHUB_BRANCH=${BRANCH}" >> $GITHUB_ENV
-          
-          # Commit was for main/release branch, build a new version
-          if [ "$BRANCH" == "master" -o "$BRANCH" == "main" ]; then
-            version="$(cat openapi/swagger-v1.yml | grep "^  version:" | awk '{print $2}')"
-            echo "VERSION=$(version)" >> $GITHUB_ENV
-            tags="latest"
-            oldversion=""
-            while [ "${oldversion}" != "${version}" ]; do
-              oldversion="${version}"
-              tags="${tags},${version}"
-              version=${version%.*}
-            done
-            echo "TAGS=${tags}" >> $GITHUB_ENV
-          else
-            echo "VERSION=$BRANCH" >> $GITHUB_ENV
-            echo "TAGS=$BRANCH" >> $GITHUB_ENV
-          fi
-
-      # build the docker image, this will always run to make sure
-      # the Dockerfile still works.
-      - name: Build image
-        uses: elgohr/Publish-Docker-Github-Action@2.22
-        env:
-          BRANCH: ${{ env.GITHUB_BRANCH }}
-          VERSION: ${{ env.VERSION }}
-          BUILDNUMBER: ${{ github.run_number }}
-          GITSHA1: ${{ github.sha  }}
-        with:
-          registry: docker.pkg.github.com
-          name: ${{ github.repository_owner }}/${{ github.event.repository.name }}/${{ matrix.IMAGE }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          context: ${{ matrix.FOLDER }}
-          tags: "${{ env.TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
-          no_push: true
+      - uses: actions/checkout@v3
 
-      # this will publish to github container registry
-      - name: Publish to GitHub
-        if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
-        uses: elgohr/Publish-Docker-Github-Action@2.22
-        env:
-          BRANCH: ${{ env.GITHUB_BRANCH }}
-          VERSION: ${{ env.VERSION }}
-          BUILDNUMBER: ${{ github.run_number }}
-          GITSHA1: ${{ github.sha  }}
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v4
         with:
-          registry: ghcr.io
-          name: ${{ github.repository_owner }}/${{ matrix.IMAGE }}
-          username: ${{ secrets.GHCR_USERNAME }}
-          password: ${{ secrets.GHCR_PASSWORD }}
-          context: ${{ matrix.FOLDER }}
-          tags: "${{ env.TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
+          images: |
+            ndslabs/apiserver
+          tags: |
+            # set latest tag for default branch
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=ref,event=pr
+            type=ref,event=tag
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
 
-      # this will publish to dockerhub
-      - name: Publish to Docker Hub
-        if: github.event_name != 'pull_request' && github.repository == env.MASTER_REPO
-        uses: elgohr/Publish-Docker-Github-Action@2.22
-        env:
-          BRANCH: ${{ env.GITHUB_BRANCH }}
-          VERSION: ${{ env.VERSION }}
-          BUILDNUMBER: ${{ github.run_number }}
-          GITSHA1: ${{ github.sha  }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
         with:
-          name: ${{ env.DOCKERHUB_ORG }}/${{ matrix.IMAGE }}
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-          context: ${{ matrix.FOLDER }}
-          tags: "${{ env.TAGS }}"
-          buildargs: BRANCH,VERSION,BUILDNUMBER,GITSHA1
+
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}