Adjust image name resolution to not omit dockersamples as a prefix

.github/workflows/load-env/action.yml

@@ -18,6 +18,14 @@ runs:
         # place repo name and owner into ENV for the image name
         echo "REPOSITORY_NAME=${{ github.event.repository.name }}" >> $GITHUB_ENV
         echo "REPOSITORY_OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV
+
+        # Don't set a prefix if this is the authoritative repository (dockersamples)
+        if [ "${REPOSITORY_NAME}" == "dockersamples" ]; then
+          echo "IMAGE_PREFIX=" >> $GITHUB_ENV
+        else
+          echo "IMAGE_PREFIX=${REPOSITORY_NAME}-" >> $GITHUB_ENV
+        fi
+
         if [ -f "${{ inputs.env-file-path }}" ]; then
           # Export variables from .env
           source "${{ inputs.env-file-path }}"

.github/workflows/pipeline-docker-cloud.yaml

@@ -126,7 +126,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.DOCKERHUB_NAMESPACE }}/${{ env.REPOSITORY_OWNER }}-${{ env.IMAGE_NAME_SUFFIX }}
+          images: ${{ env.DOCKERHUB_NAMESPACE }}/${{ env.IMAGE_PREFIX }}${{ env.IMAGE_NAME }}
           tags: |
             type=ref,enable=true,event=branch,suffix=--{{sha}}
             type=ref,enable=true,event=branch,suffix=--latest

.github/workflows/pipeline-gha.yaml

@@ -121,7 +121,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.DOCKERHUB_NAMESPACE }}/${{ env.REPOSITORY_OWNER }}-${{ env.IMAGE_NAME_SUFFIX }}-gha
+          images: ${{ env.DOCKERHUB_NAMESPACE }}/${{ env.IMAGE_PREFIX }}${{ env.IMAGE_NAME }}-gha
           tags: |
             type=ref,enable=true,event=branch,suffix=--{{sha}}
             type=ref,enable=true,event=branch,suffix=--latest

gha.env

@@ -1,5 +1,5 @@
 DOCKERHUB_NAMESPACE=dockerdevrel
-IMAGE_NAME_SUFFIX=catalog-service-node
+IMAGE_NAME=catalog-service-node
 DBC_BUILDER_NAME=dockerdevrel/demo-builder
 # You will also need the following secrets in the repository:
 # DOCKERHUB_USERNAME