removing extra stages

Author: karpikpl

.github/workflows/deploy_to_ghcr.yml

@@ -32,7 +32,10 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          # this is back a single image, `-with-proxy` is legacy and will be removed
+          images: |
+            ghcr.io/${{ github.repository }}
+            ghcr.io/${{ github.repository }}-with-proxy
           labels: |
             org.opencontainers.image.title=copilot-metrics-viewer
             org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
@@ -52,47 +55,6 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           push: true
 
-  push_proxy_to_ghcr:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout GitHub Action
-        uses: actions/checkout@v4
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      # Adding below tag any push to main as "latest"
-      # To deploy latest, create a release with a semver tag
-      # type=raw,value=latest,enable={{is_default_branch}}
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}-with-proxy
-          labels: |
-            org.opencontainers.image.title=copilot-metrics-viewer-with-proxy
-            org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
-            org.opencontainers.image.source=${{ github.repository }}
-          tags: |
-            type=sha
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: Build and push api
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: api.Dockerfile
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          push: true
-
   deploy:
     runs-on: ubuntu-latest
     needs: push_to_ghcr

.github/workflows/deploy_to_ghcr_custom_tag.yaml

@@ -33,7 +33,9 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: |
+            ghcr.io/${{ github.repository }}
+            ghcr.io/${{ github.repository }}-with-proxy
           labels: |
             org.opencontainers.image.title=copilot-metrics-viewer
             org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
@@ -53,47 +55,3 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           push: true
-
-  push_proxy_to_ghcr:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout GitHub Action
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Fetch all history for all tags and branches
-          ref: ${{ github.event.inputs.tag }}
-
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}-with-proxy
-          labels: |
-            org.opencontainers.image.title=copilot-metrics-viewer-with-proxy
-            org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
-            org.opencontainers.image.source=${{ github.repository }}
-          tags: |
-            type=raw,enable=true,priority=1,value=${{ github.event.inputs.tag }}
-            type=sha
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: Build and push api
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: api.Dockerfile
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          push: true
-        

.github/workflows/deploy_to_ghcr_tag_release.yaml

@@ -38,9 +38,6 @@ jobs:
             exit 1
           fi
 
-          cd api
-          npm version from-git --no-git-tag-version
-          cd ..
           git add .
           git commit --signoff --message $version
 
@@ -80,7 +77,9 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: |
+            ghcr.io/${{ github.repository }}
+            ghcr.io/${{ github.repository }}-with-proxy
           labels: |
             org.opencontainers.image.title=copilot-metrics-viewer
             org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
@@ -99,45 +98,3 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           push: true
-
-  push_proxy_to_ghcr:
-    runs-on: ubuntu-latest
-    needs: version_update
-    steps:
-      - name: Checkout GitHub Action
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.release.tag_name }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}-with-proxy
-          labels: |
-            org.opencontainers.image.title=copilot-metrics-viewer-with-proxy
-            org.opencontainers.image.description=Metrics viewer for GitHub Copilot usage
-            org.opencontainers.image.source=${{ github.repository }}
-          tags: |
-            type=sha
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-
-      - name: Build and push api
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: api.Dockerfile
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          push: true
-