From 9a92a18a30919db3154efbef92b79d96a228768e Mon Sep 17 00:00:00 2001
From: Adam <adam@aboutcher.co.uk>
Date: Mon, 16 Aug 2021 12:22:14 +0100
Subject: [PATCH] Update 2_unstable.yml

Move base upload.
---
 .github/workflows/2_unstable.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml
index 98edde1d..e6558fd7 100644
--- a/.github/workflows/2_unstable.yml
+++ b/.github/workflows/2_unstable.yml
@@ -453,9 +453,17 @@ jobs:
           key: buildx-docker-master
           restore-keys: |
             buildx-docker-master
-
       - name: Docker Build :base
         run: make buildx-base
+        
+      - name: Docker Login
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
+        
+      - name: Docker Upload :base
+        run: docker buildx build --push --cache-from=type=local,src=/tmp/.buildx-cache
 
       - name: Docker Build :dev
         run: make buildx-dev
@@ -466,9 +474,6 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: echo "${DOCKER_PASSWORD}" | docker login --username "${DOCKER_USERNAME}" --password-stdin
 
-      - name: Docker Upload :base
-        run: docker buildx build --push --cache-from=type=local,src=/tmp/.buildx-cache
-
       - name: Docker Upload :dev
         run: docker buildx build --push --cache-from=type=local,src=/tmp/.buildx-cache