GCR AWS plus publish fix (#4934)

remove GCP marketplace from release process
nginxinc · Jan 16, 2024 · 3990129 · 3990129
1 parent 19706a7
commit 3990129
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/.github/workflows/build-plus.yml b/.github/workflows/build-plus.yml
@@ -80,13 +80,13 @@ jobs:
           service_account: ${{ secrets.GCR_SERVICE_ACCOUNT_MKTPL }}
         if: github.ref_type == 'tag' && ! contains(inputs.target, 'aws')
 
-      - name: Login to GCR for Marketplace
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
-        with:
-          registry: gcr.io
-          username: oauth2accesstoken
-          password: ${{ steps.auth-mktpl.outputs.access_token }}
-        if: github.ref_type == 'tag' && ! contains(inputs.target, 'aws')
+      # - name: Login to GCR for Marketplace
+      #   uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+      #   with:
+      #     registry: gcr.io
+      #     username: oauth2accesstoken
+      #     password: ${{ steps.auth-mktpl.outputs.access_token }}
+      #   if: github.ref_type == 'tag' && ! contains(inputs.target, 'aws')
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
@@ -124,7 +124,6 @@ jobs:
         with:
           images: |
             name=gcr.io/f5-gcs-7899-ptg-ingrss-ctlr/dev/nginx-ic${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}/nginx-plus-ingress
-            name=gcr.io/f5-7626-networks-public/nginxinc/nginx-plus-ingress${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }},enable=${{ github.ref_type == 'tag' && ! contains(inputs.target, 'aws') && ! contains(inputs.image, 'alpine') && ! contains(inputs.image, 'ubi') }}
             name=docker-mgmt.nginx.com/nginx-ic${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }}${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}/nginx-plus-ingress,enable=${{ github.ref_type != 'pull_request' && ! startsWith(github.ref, 'refs/heads/release-') && ! contains(inputs.target, 'aws') }}
             name=709825985650.dkr.ecr.us-east-1.amazonaws.com/nginx/nginx-plus-ingress${{ contains(inputs.nap_modules, 'dos') && '-dos' || '' }}${{ contains(inputs.nap_modules, 'waf') && '-nap' || '' }},enable=${{ github.ref_type == 'tag' && contains(inputs.target, 'aws') }}
           flavor: |
@@ -136,7 +135,6 @@ jobs:
             type=ref,event=branch,enable=${{ startsWith(github.ref, 'refs/heads/release-') }}
             type=schedule
             type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
           labels: |
             org.opencontainers.image.description=NGINX Plus Ingress Controller for Kubernetes
             org.opencontainers.image.documentation=https://docs.nginx.com/nginx-ingress-controller