Adding support for specifying namespace when deploying images to a docker repository

Author: walisc

.github/workflows/actions/build-deploy-images/action.yml

@@ -10,6 +10,8 @@ inputs:
     required: true
   docker-password:
     required: true
+  docker-namespace:
+    required: false
 runs:
   using: 'composite'
   steps:
@@ -22,4 +24,5 @@ runs:
         docker-push-tag: ${{ inputs.docker-push-tag }}
         docker-username: ${{ inputs.docker-username }}
         docker-password: ${{ inputs.docker-password }}
-        docker-host: ${{ inputs.docker-host }}
+        docker-host: ${{ inputs.docker-host }}
+        docker-namespace: ${{ inputs.docker-namespace }}

.github/workflows/actions/docker-images-deploy/action.yml

@@ -10,6 +10,8 @@ inputs:
     required: true
   docker-password:
     required: true
+  docker-namespace:
+    required: false
 runs:
   using: 'composite'
   steps:
@@ -20,5 +22,6 @@ runs:
             "${{ inputs.docker-push-tag }}" \
             "${{ inputs.docker-host }}" \
             "${{ inputs.docker-username }}" \
-            "${{ inputs.docker-password }}"
+            "${{ inputs.docker-password }}" \
+            "${{ inputs.docker-namespace || 'jembi' }}"
       shell: bash

.github/workflows/actions/docker-images-deploy/deployDockerImages.sh

@@ -5,6 +5,7 @@ push_tag=$2
 registry_url=$3
 username=$4
 password=$5
+namespace=$6
 
 if [ -z "$registry_url" ] || [ -z "$username" ] || [ -z "$password" ]; then
     echo "Docker host details not set. Skipping deploying"
@@ -26,7 +27,7 @@ IMAGE_LIST=$(docker image ls --filter "reference=*:$original_tag" --format "{{.R
 
 for IMAGE in $IMAGE_LIST; do
     IFS=':' read -a image_details <<< "$IMAGE"
-    push_tag_url="$registry_url/$username/${image_details[0]}:$push_tag"
+    push_tag_url="$registry_url/$namespace/${image_details[0]}:$push_tag"
 
     echo "Pushing image: $IMAGE to '$push_tag_url'"
 

.github/workflows/deploy-images-dockerhub.yml

@@ -51,4 +51,5 @@ jobs:
         docker-push-tag: ${{ steps.validate-tag.outputs.docker-push-tag }}
         docker-host: "docker.io"
         docker-username: ${{ secrets.DOCKER_HUB_USER_NAME }}
-        docker-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        docker-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        docker-namespace: ${{ vars.DOCKER_HUB_NAMESPACE }}

.github/workflows/entry-on-merge.yml

@@ -36,4 +36,5 @@ jobs:
         image-build-tag: ${{ steps.get-image-build-tag.outputs.image-build-tag }}
         docker-host: ${{ vars.DOCKER_LOCAL_HOST_NAME }}
         docker-username: ${{ secrets.DOCKER_LOCAL_USER_NAME }}
-        docker-password: ${{ secrets.DOCKER_LOCAL_PASSWORD }}
+        docker-password: ${{ secrets.DOCKER_LOCAL_PASSWORD }}
+        docker-namespace: ${{ vars.DOCKER_LOCAL_NAMESPACE }}

.github/workflows/entry-on-release.yml

@@ -36,4 +36,5 @@ jobs:
         docker-push-tag: ${{ steps.validate-tag.outputs.docker-push-tag }}
         docker-host: "docker.io"
         docker-username: ${{ secrets.DOCKER_HUB_USER_NAME }}
-        docker-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        docker-password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+        docker-namespace: ${{ vars.DOCKER_HUB_NAMESPACE }}