ci: clean up for pr

.github/workflows/build-push-container.yml

@@ -50,61 +50,3 @@ jobs:
       - name: Build and push container tags
         run: |
           ./scripts/docker/build-push-container -n ${{ inputs.container_name }}
-
-      # - name: Build and push
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     platforms: linux/amd64,linux/arm64
-      #     push: true
-      #     tags: user/app:latest
-    # - name: Checkout repository
-    #   uses: actions/checkout@v4
-    #   with: 
-    #     submodules: true
-    #     ref: ${{ github.event.pull_request.head.ref || github.ref }}
-
-
-    # - name: Login to GHCR
-    #   uses: docker/login-action@v3
-    #   with:
-    #     registry: ghcr.io
-    #     username: ${{ github.repository_owner }}
-    #     password: ${{ secrets.INFRA_GH_TOKEN }}
-
-    # - name: Login to Docker Hub for rate limiting
-    #   uses: docker/login-action@v3
-    #   with:
-    #     username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    #     password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-    # - name: Build and push container tags
-    #   run: |
-    #     ./scripts/docker/build-push-container -n ${{ inputs.container_name }}
-
-  # container-manifest:
-  #   name: Manifest ${{ inputs.container_name }}
-  #   needs: container-build
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v4
-  #       with: 
-  #         submodules: true
-  #         ref: ${{ github.event.pull_request.head.ref || github.ref }}
-
-  #     - name: Login to GHCR
-  #       uses: docker/login-action@v3
-  #       with:
-  #         registry: ghcr.io
-  #         username: ${{ github.repository_owner }}
-  #         password: ${{ secrets.INFRA_GH_TOKEN }}
-
-  #     - name: Login to Docker Hub
-  #       uses: docker/login-action@v3
-  #       with:
-  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
-  #         password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-  #     - name: Build and push container manifest
-  #       run: |
-  #         ./scripts/docker/build-push-manifest -n ${{ inputs.container_name }}

.github/workflows/build-push-containers-all.yml

@@ -12,7 +12,6 @@ on:
       - '**' 
 
 jobs:
-
   build-push-checked-containers:
     uses: ./.github/workflows/build-push-container.yml
     name: Build Push Checked Containers

.github/workflows/build-push-manifest.yml

@@ -46,62 +46,4 @@ jobs:
 
       - name: Build and push container tags
         run: |
-          ./scripts/docker/build-push-manifest -n ${{ inputs.container_name }}
-
-      # - name: Build and push
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     platforms: linux/amd64,linux/arm64
-      #     push: true
-      #     tags: user/app:latest
-    # - name: Checkout repository
-    #   uses: actions/checkout@v4
-    #   with: 
-    #     submodules: true
-    #     ref: ${{ github.event.pull_request.head.ref || github.ref }}
-
-
-    # - name: Login to GHCR
-    #   uses: docker/login-action@v3
-    #   with:
-    #     registry: ghcr.io
-    #     username: ${{ github.repository_owner }}
-    #     password: ${{ secrets.INFRA_GH_TOKEN }}
-
-    # - name: Login to Docker Hub for rate limiting
-    #   uses: docker/login-action@v3
-    #   with:
-    #     username: ${{ secrets.DOCKER_HUB_USERNAME }}
-    #     password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-    # - name: Build and push container tags
-    #   run: |
-    #     ./scripts/docker/build-push-container -n ${{ inputs.container_name }}
-
-  # container-manifest:
-  #   name: Manifest ${{ inputs.container_name }}
-  #   needs: container-build
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Checkout repository
-  #       uses: actions/checkout@v4
-  #       with: 
-  #         submodules: true
-  #         ref: ${{ github.event.pull_request.head.ref || github.ref }}
-
-  #     - name: Login to GHCR
-  #       uses: docker/login-action@v3
-  #       with:
-  #         registry: ghcr.io
-  #         username: ${{ github.repository_owner }}
-  #         password: ${{ secrets.INFRA_GH_TOKEN }}
-
-  #     - name: Login to Docker Hub
-  #       uses: docker/login-action@v3
-  #       with:
-  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
-  #         password: ${{ secrets.DOCKER_HUB_TOKEN }}
-
-  #     - name: Build and push container manifest
-  #       run: |
-  #         ./scripts/docker/build-push-manifest -n ${{ inputs.container_name }}
+          ./scripts/docker/build-push-manifest -n ${{ inputs.container_name }}

scripts/docker/build-push-container

@@ -118,15 +118,4 @@ docker buildx build \
   --file "$dockerfile_path" \
   $(for tag in "${container_tags[@]}"; do echo -n " -t $tag "; done) \
   --push \
-  "$git_root"
-
-# # build and tag the docker image
-# docker build $git_root \
-#     -f $dockerfile_path \
-#     $(for tag in "${container_tags[@]}"; do echo -n " -t $tag"; done)
-
-# # Push the Docker images
-# for tag in "${container_tags[@]}"; do
-#     docker push $tag
-# done
-
+  "$git_root"

scripts/docker/build-push-manifest

@@ -88,11 +88,6 @@ if [ "$debug" = true ]; then
     done
 fi
 
-# for tag in "${container_tags[@]}"; do
-#     docker pull $tag-amd64
-#     docker pull $tag-arm64
-# done
-
 docker buildx imagetools create \
     $(for tag in "${container_tags[@]}"; do echo -n " --tag $tag"; done) \
     $container_tag_commit-amd64 \