From e24ef8be27d1a963b645e6a06ca6826997903568 Mon Sep 17 00:00:00 2001 From: Nicko Guyer Date: Wed, 1 Feb 2023 16:37:09 -0500 Subject: [PATCH] Update to docker/build-push-action@v4 Signed-off-by: Nicko Guyer --- .github/workflows/docker_main.yml | 7 ++++--- .github/workflows/docker_release.yml | 13 +++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker_main.yml b/.github/workflows/docker_main.yml index 04d3cfe7ad..97b9b3864c 100644 --- a/.github/workflows/docker_main.yml +++ b/.github/workflows/docker_main.yml @@ -35,7 +35,7 @@ jobs: BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ") echo ::set-output name=BUILD_TAG::$BUILD_TAG echo ::set-output name=BUILD_DATE::$BUILD_DATE - + - name: Read manifest.json id: manifest run: | @@ -48,8 +48,9 @@ jobs: echo ::set-output name=UI_RELEASE::$(cat manifest.json | jq -r '.ui.release') - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: + provenance: false context: ./ file: ./Dockerfile builder: ${{ steps.buildx.outputs.name }} @@ -69,4 +70,4 @@ jobs: SOLIDITY_BUILDER_TAG=${{ steps.manifest.outputs.SOLIDITY_BUILDER_TAG }} BASE_TAG=${{ steps.manifest.outputs.BASE_TAG }} UI_TAG=${{ steps.manifest.outputs.UI_TAG }} - UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }} \ No newline at end of file + UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }} diff --git a/.github/workflows/docker_release.yml b/.github/workflows/docker_release.yml index 1254895686..f11b57effb 100644 --- a/.github/workflows/docker_release.yml +++ b/.github/workflows/docker_release.yml @@ -25,7 +25,7 @@ jobs: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - + - name: Set latest tag if: github.event.action == 'released' run: | @@ -34,17 +34,17 @@ jobs: - name: Set alpha tag if: github.event.action == 'prereleased' && contains(github.ref, 'alpha') run: | - echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:alpha" >> $GITHUB_ENV + echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:alpha" >> $GITHUB_ENV - name: Set beta tag if: github.event.action == 'prereleased' && contains(github.ref, 'beta') run: | - echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:beta" >> $GITHUB_ENV + echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:beta" >> $GITHUB_ENV - name: Set rc tag if: github.event.action == 'prereleased' && contains(github.ref, 'rc') run: | - echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:rc" >> $GITHUB_ENV + echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:rc" >> $GITHUB_ENV - name: Set build tag id: build_tag_generator @@ -67,8 +67,9 @@ jobs: echo ::set-output name=UI_RELEASE::$(cat manifest.json | jq -r '.ui.release') - name: Build and push - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: + provenance: false context: ./ file: ./Dockerfile builder: ${{ steps.buildx.outputs.name }} @@ -88,4 +89,4 @@ jobs: SOLIDITY_BUILDER_TAG=${{ steps.manifest.outputs.SOLIDITY_BUILDER_TAG }} BASE_TAG=${{ steps.manifest.outputs.BASE_TAG }} UI_TAG=${{ steps.manifest.outputs.UI_TAG }} - UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }} \ No newline at end of file + UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }}