6601: Fixed build image names in actions

Author: cableman

.github/workflows/github_build_release.yml

@@ -102,7 +102,7 @@ jobs:
           tags: |
             type=raw,value=${{ github.ref_name }}
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image (main)
         id: push-main
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
@@ -113,16 +113,8 @@ jobs:
           push: true
           tags: ${{ steps.meta-main.outputs.tags }}
           labels: ${{ steps.meta-main.outputs.labels }}
-          provenance: mode=max
           sbom: true
 
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_MAIN}}
-          subject-digest: ${{ steps.push-main.outputs.digest }}
-          push-to-registry: true
-
       # Build Nginx (depends on main)
       - name: Docker meta (nginx)
         id: meta-nginx
@@ -132,24 +124,17 @@ jobs:
           tags: |
             type=raw,value=${{ github.ref_name }}
 
-      - name: Build and push Docker image
+      - name: Build and push Docker image (nginx)
         id: push-nginx
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           context: ./infrastructure/nginx/
           file: ./infrastructure/nginx/Dockerfile
           build-args: |
             APP_VERSION=${{ github.ref_name }}
+            APP_IMAGE=${{ env.IMAGE_NAME_MAIN }}
           push: true
           pull: true
           tags: ${{ steps.meta-nginx.outputs.tags }}
           labels: ${{ steps.meta-nginx.outputs.labels }}
-          provenance: mode=max
           sbom: true
-
-      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@v3
-        with:
-          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME_NGINX}}
-          subject-digest: ${{ steps.push-nginx.outputs.digest }}
-          push-to-registry: true

infrastructure/build-n-push.sh

@@ -12,17 +12,18 @@ docker buildx build \
       --no-cache \
       --pull \
       --build-arg APP_VERSION=${APP_VERSION} \
-      --tag=ghcr.io/itk-dev/display-api-service:${APP_VERSION} \
+      --tag=ghcr.io/itk-dev/os2display-api-service:${APP_VERSION} \
       --file="display-api-service/Dockerfile" ../
 
-docker push ghcr.io/itk-dev/display-api-service:${APP_VERSION}
+docker push ghcr.io/itk-dev/os2display-api-service:${APP_VERSION}
 
 docker buildx build \
       --platform linux/amd64,linux/arm64 \
       --no-cache \
       --pull \
       --build-arg APP_VERSION=${APP_VERSION} \
-      --tag=ghcr.io/itk-dev/display-api-service-nginx:${APP_VERSION} \
+      --build-arg APP_IMAGE=os2display-api-service \
+      --tag=ghcr.io/itk-dev/os2display-api-service-nginx:${APP_VERSION} \
       --file="nginx/Dockerfile" nginx
 
-docker push ghcr.io/itk-dev/display-api-service-nginx:${APP_VERSION}
+docker push ghcr.io/itk-dev/os2display-api-service-nginx:${APP_VERSION}

infrastructure/nginx/Dockerfile

@@ -1,6 +1,7 @@
 ARG APP_VERSION="develop"
+ARG APP_IMAGE="os2display-api-service"
 
-FROM --platform=$BUILDPLATFORM ghcr.io/itk-dev/display-api-service:${APP_VERSION} AS app
+FROM --platform=$BUILDPLATFORM ghcr.io/itk-dev/os2display-api-service:${APP_VERSION} AS app
 
 
 ######## Nginx production image ########