From 9af6810cf641e7323a89ba5a686f0a46574f0a3c Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 18 Apr 2023 00:23:10 +0200
Subject: [PATCH] properly use DOCKERHUB_ORGANISATION in publish

---
 .env.dist                     |  5 ++++-
 .github/workflows/publish.yml | 11 ++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.env.dist b/.env.dist
index b794cd7..80ef9ad 100644
--- a/.env.dist
+++ b/.env.dist
@@ -16,4 +16,7 @@
 #DOCKERHUB_OCELOT_TAG=12-ocelot.social2.4.0
 
 # DOCKERHUB_BRAND_VARRIANT defines the name of the branded image uploaded to dockerhub.
-DOCKERHUB_BRAND_VARRIANT=stage-ocelot-social
\ No newline at end of file
+DOCKERHUB_BRAND_VARRIANT=stage-ocelot-social
+
+# DOCKERHUB_ORGANISATION defines which dockerhub organisation images will be uploaded to
+# DOCKERHUB_ORGANISATION=ocelotsocialnetwork
\ No newline at end of file
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c337a9b..a8d4865 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -30,6 +30,11 @@ jobs:
             echo "GITHUB_OCELOT_REF=${GITHUB_OCELOT_REF_JUST_BUILT}" >> $GITHUB_ENV
           fi
         shell: bash
+      - name: Set DOCKERHUB_ORGANISATION
+        run: |
+          if [ -z ${DOCKERHUB_ORGANISATION} ]; then
+            echo "DOCKERHUB_ORGANISATION=ocelotsocialnetwork" >> $GITHUB_ENV
+          fi
       - name: Checkout Ocelot code
         uses: actions/checkout@v3
         with:
@@ -55,9 +60,9 @@ jobs:
       - name: Build branded images
         run: |
           ocelot/deployment/scripts/branded-images.build.sh
-          docker save "ocelotsocialnetwork/backend-${DOCKERHUB_BRAND_VARRIANT}" > /tmp/backend-branded.tar
-          docker save "ocelotsocialnetwork/webapp-${DOCKERHUB_BRAND_VARRIANT}" > /tmp/webapp-branded.tar
-          docker save "ocelotsocialnetwork/maintenance-${DOCKERHUB_BRAND_VARRIANT}" > /tmp/maintenance-branded.tar
+          docker save "${DOCKERHUB_ORGANISATION}/backend-${DOCKERHUB_BRAND_VARRIANT}" > /tmp/backend-branded.tar
+          docker save "${DOCKERHUB_ORGANISATION}/webapp-${DOCKERHUB_BRAND_VARRIANT}" > /tmp/webapp-branded.tar
+          docker save "${DOCKERHUB_ORGANISATION}/maintenance-${DOCKERHUB_BRAND_VARRIANT}" > /tmp/maintenance-branded.tar
 
       - name: Upload Artifact (Backend)
         uses: actions/upload-artifact@v2