From 629272c7305bb98d78b0e89fa8e1d1e9a192f0e8 Mon Sep 17 00:00:00 2001
From: Xiaonan Shen <s@sxn.dev>
Date: Mon, 1 Jun 2020 07:34:23 -0700
Subject: [PATCH] Fix multiarch workflow

---
 .github/workflows/build.yaml | 10 ++++------
 build/build-docker.sh        |  9 ++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index e31a7ef..67eb8e7 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -16,7 +16,7 @@ on:
       - build/VERSION
 
 env:
-  DOCKER_TAG: shenxn/protonmail-bridge
+  DOCKER_REPO: shenxn/protonmail-bridge
 
 jobs:
   build:
@@ -24,12 +24,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@master
-      - name: Docker login
-        uses: azure/docker-login@v1
-        with:
-          username: ${{ secrets.REGISTRY_USERNAME }}
-          password: ${{ secrets.REGISTRY_USERNAME }}
       - name: Set up Docker buildx
         uses: crazy-max/ghaction-docker-buildx@v2
       - name: Build image
         run: bash build/build-docker.sh
+        env:
+          DOCKER_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
diff --git a/build/build-docker.sh b/build/build-docker.sh
index 69f6005..a2c1284 100644
--- a/build/build-docker.sh
+++ b/build/build-docker.sh
@@ -11,11 +11,14 @@ cd $SCRIPTPATH
 VERSION=`cat VERSION`
 if [[ $GITHUB_REF == "refs/heads/master" ]]; then
     TAG_TYPE="build"
-    TAG_VERTION="${VERSION}-build"
+    TAG_VERSION="${VERSION}-build"
 else
     TAG_TYPE="build-dev"
-    TAG_VERTION="${VERSION}-build-dev"
+    TAG_VERSION="${VERSION}-build-dev"
 fi
 
+# Docker login
+echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+
 # Build multiarch and push
-docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t ${DOCKER_REPO}:${TAG_TYPE} -t ${DOCKER_REPO}:${TAG_VERSION} --push .
+docker buildx build $BUILD_ARGS --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 -t ${DOCKER_REPO}:${TAG_TYPE} -t ${DOCKER_REPO}:${TAG_VERSION} --push .