Update docker-publish.yml

Author: oscar

.github/workflows/docker-publish.yml

@@ -21,7 +21,7 @@ on:
 
 env:
   REGISTRY: docker.io
-  IMAGE_NAME: ${{ github.repository_owner }}
+  IMAGE_NAME_PREFIX: ${{ github.repository_owner }}
 
 jobs:
   build-and-push:
@@ -34,13 +34,13 @@ jobs:
             context: .
           - dockerfile: ./webapp/Dockerfile
             image_name: digger-webapp
-            context: ./webapp
+            context: .
           - dockerfile: ./grafana/Dockerfile
             image_name: digger-grafana
-            context: ./grafana
+            context: .
           - dockerfile: ./pcap_broker/Dockerfile
             image_name: digger-pcap-broker
-            context: ./pcap_broker
+            context: .
 
     permissions:
       contents: read
@@ -59,15 +59,15 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Convert repository name to lowercase
-        id: lowercase
-        run: echo "image_name=${{ env.IMAGE_NAME }}" | tr '[:upper:]' '[:lower:]' >> $GITHUB_OUTPUT
+      - name: Convert owner to lowercase
+        id: lowercase_owner
+        run: echo "owner=$(echo ${{ env.IMAGE_NAME_PREFIX }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
 
       - name: Extract metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ steps.lowercase.outputs.image_name }}/${{ matrix.image_name }}
+          images: ${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/${{ matrix.image_name }}
           tags: |
             type=ref,event=branch
             type=semver,pattern={{version}}
@@ -83,24 +83,27 @@ jobs:
           push: ${{ secrets.DOCKER_USERNAME != '' && secrets.DOCKER_PASSWORD != '' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase.outputs.image_name }}/${{ matrix.image_name }}:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase.outputs.image_name }}/${{ matrix.image_name }}:buildcache,mode=max
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/${{ matrix.image_name }}:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/${{ matrix.image_name }}:buildcache,mode=max
 
   summary:
     runs-on: ubuntu-latest
     needs: build-and-push
     if: always()
     steps:
+      - name: Convert owner to lowercase
+        id: lowercase_owner
+        run: echo "owner=$(echo ${{ env.IMAGE_NAME_PREFIX }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_OUTPUT
       - name: Create job summary
         run: |
           echo "## Docker Images Published" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "The following images have been built and pushed:" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
-          echo "- \`docker.io/pwnzer0tt1/digger-suricata\`" >> $GITHUB_STEP_SUMMARY
-          echo "- \`docker.io/pwnzer0tt1/digger-webapp\`" >> $GITHUB_STEP_SUMMARY
-          echo "- \`docker.io/pwnzer0tt1/digger-grafana\`" >> $GITHUB_STEP_SUMMARY
-          echo "- \`docker.io/pwnzer0tt1/digger-pcap-broker\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/digger-suricata\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/digger-webapp\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/digger-grafana\`" >> $GITHUB_STEP_SUMMARY
+          echo "- \`${{ env.REGISTRY }}/${{ steps.lowercase_owner.outputs.owner }}/digger-pcap-broker\`" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "**Tags applied:**" >> $GITHUB_STEP_SUMMARY
           echo "- Branch name (for push events)" >> $GITHUB_STEP_SUMMARY