From a7a69506a0c97ce9cfb39061ec03d1d8b111c269 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandro@alejandrocelaya.com>
Date: Fri, 31 Jul 2020 20:37:14 +0200
Subject: [PATCH] Fixed how docker credentials are read from secrets

---
 .github/workflows/docker-image-build.yml | 2 ++
 docker/build                             | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-image-build.yml b/.github/workflows/docker-image-build.yml
index 1c2baf4e..64ccaa17 100644
--- a/.github/workflows/docker-image-build.yml
+++ b/.github/workflows/docker-image-build.yml
@@ -18,5 +18,7 @@ jobs:
         uses: crazy-max/ghaction-docker-buildx@v1
         with:
           buildx-version: latest
+      - name: Login to docker hub
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
       - name: Build the image
         run: bash ./docker/build
diff --git a/docker/build b/docker/build
index a8cb1c90..0302d607 100755
--- a/docker/build
+++ b/docker/build
@@ -6,8 +6,6 @@ PLATFORMS="linux/arm/v7,linux/arm64/v8,linux/amd64"
 # PLATFORMS="linux/amd64"
 DOCKER_IMAGE="shlinkio/lab"
 
-echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-
 # If ref is not develop, then this is a tag. Build that docker tag and also "stable"
 if [[ "$GITHUB_REF" != *"develop"* ]]; then
   TAGS="-t ${DOCKER_IMAGE}:${GITHUB_REF#?}"