From 4e32ca94115a59e109133b3c6484e0de115b21fd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:45:36 +0000 Subject: [PATCH 1/2] Bump docker/build-push-action from 6.2.0 to 6.3.0 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.2.0 to 6.3.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/15560696de535e4014efeff63c48f16952e52dd1...1a162644f9a7e87d8f4b053101d1d9a712edc18c) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- .github/workflows/conformance.yml | 6 +++--- .github/workflows/functional.yml | 4 ++-- .github/workflows/helm.yml | 4 ++-- .github/workflows/nfr.yml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4a70f2c5e4..5efdacc9f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -113,7 +113,7 @@ jobs: DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index - name: Build Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || '' }} context: "." diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 85ed175903..77ae5ddf3e 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -88,7 +88,7 @@ jobs: TELEMETRY_ENDPOINT_INSECURE: "false" - name: Build NGF Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile tags: ${{ steps.ngf-meta.outputs.tags }} @@ -99,7 +99,7 @@ jobs: pull: true - name: Build NGINX Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}} tags: ${{ steps.nginx-meta.outputs.tags }} @@ -118,7 +118,7 @@ jobs: working-directory: ./tests - name: Build Test Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: tests/conformance/Dockerfile tags: conformance-test-runner:${{ github.sha }} diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml index 9227fbe054..50fd243f28 100644 --- a/.github/workflows/functional.yml +++ b/.github/workflows/functional.yml @@ -76,7 +76,7 @@ jobs: TELEMETRY_ENDPOINT_INSECURE: "true" - name: Build NGF Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile tags: ${{ steps.ngf-meta.outputs.tags }} @@ -87,7 +87,7 @@ jobs: target: goreleaser - name: Build NGINX Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}} tags: ${{ steps.nginx-meta.outputs.tags }} diff --git a/.github/workflows/helm.yml b/.github/workflows/helm.yml index 319e54e851..8fdfb046b1 100644 --- a/.github/workflows/helm.yml +++ b/.github/workflows/helm.yml @@ -60,7 +60,7 @@ jobs: type=ref,event=branch,suffix=-rc,enable=${{ startsWith(github.ref, 'refs/heads/release') }} - name: Build NGF Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile tags: ${{ steps.ngf-meta.outputs.tags }} @@ -71,7 +71,7 @@ jobs: pull: true - name: Build NGINX Docker Image - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile${{ inputs.image == 'nginx' && '.nginx' || '' }}${{ inputs.image == 'plus' && '.nginxplus' || ''}} tags: ${{ steps.nginx-meta.outputs.tags }} diff --git a/.github/workflows/nfr.yml b/.github/workflows/nfr.yml index 71fa4c7d42..db17b9cf91 100644 --- a/.github/workflows/nfr.yml +++ b/.github/workflows/nfr.yml @@ -89,7 +89,7 @@ jobs: - name: Build NGINX Plus Docker Image if: ${{ inputs.nginx_plus == true }} - uses: docker/build-push-action@15560696de535e4014efeff63c48f16952e52dd1 # v6.2.0 + uses: docker/build-push-action@1a162644f9a7e87d8f4b053101d1d9a712edc18c # v6.3.0 with: file: build/Dockerfile.nginxplus tags: ${{ steps.nginx-meta.outputs.tags }} From e7743f20cbfd5c9be13388a79b51666caa287f03 Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Fri, 5 Jul 2024 10:39:49 -0700 Subject: [PATCH 2/2] Update deprecated variable --- .github/workflows/conformance.yml | 2 +- .github/workflows/functional.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml index 77ae5ddf3e..e35ae09803 100644 --- a/.github/workflows/conformance.yml +++ b/.github/workflows/conformance.yml @@ -27,7 +27,7 @@ jobs: permissions: contents: write # needed for uploading release artifacts env: - DOCKER_BUILD_NO_SUMMARY: true + DOCKER_BUILD_SUMMARY: false steps: - name: Checkout Repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml index 50fd243f28..389258f5e1 100644 --- a/.github/workflows/functional.yml +++ b/.github/workflows/functional.yml @@ -22,7 +22,7 @@ jobs: name: Run Tests runs-on: ubuntu-22.04 env: - DOCKER_BUILD_NO_SUMMARY: true + DOCKER_BUILD_SUMMARY: false steps: - name: Checkout Repository uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7