From a86c13d75ebf31dca1b8ecf2653e0c01ed499bdd Mon Sep 17 00:00:00 2001
From: Kirill Kouzoubov <kirill888@gmail.com>
Date: Wed, 25 Aug 2021 10:36:10 +1000
Subject: [PATCH] Fix docker push logic

was cut and pasted from datacube repo which uses different secret names
---
 .github/workflows/main.yml | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 43973389b..7d4666e1a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -139,22 +139,18 @@ jobs:
         && github.repository == 'opendatacube/odc-tools'
 
       run: |
-        if [ -n "${{ secrets.DockerPassword }}" ]; then
-           echo "Login to DockerHub as ${DOCKER_USER}"
-           echo "${{ secrets.DockerPassword }}" | docker login -u "${DOCKER_USER}" --password-stdin
+        if [ -n "${{ secrets.DOCKER_USER }}" ]; then
+           echo "Login to DockerHub as ${{ secrets.DOCKER_USER }}"
+           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USER }}" --password-stdin
            echo "::set-output name=logged_in::yes"
         else
-           echo "Set DockerPassword secret to push to docker"
+           echo "Set DOCKER_{PASSWORD,USER} secrets to push to docker"
+           echo "::set-output name=logged_in::no"
         fi
 
     - name: DockerHub Push
       if: |
-        github.event_name == 'push'
-        && github.ref == 'refs/heads/develop'
-        && github.repository == 'opendatacube/odc-tools'
-        && steps.dkr.outputs.logged_in == 'yes'
+        steps.dkr.outputs.logged_in == 'yes'
 
       run: |
-        if [ -n "${{ secrets.DockerPassword }}" ]; then
-           docker push "${{ steps.cfg.outputs.docker_image }}"
-        fi
+        docker push "${{ steps.cfg.outputs.docker_image }}"