properly use DOCKERHUB_ORGANISATION in publish

.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
+DOCKERHUB_BRAND_VARRIANT=stage-ocelot-social
+
+# DOCKERHUB_ORGANISATION defines which dockerhub organisation images will be uploaded to
+# DOCKERHUB_ORGANISATION=ocelotsocialnetwork

.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