Skip to content

Commit d3b8538

Browse files
authored
Merge pull request #1176 from kaleido-io/docker
Update to docker/build-push-action@v4
2 parents 7531149 + e4263af commit d3b8538

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

.github/workflows/docker_main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
3636
echo ::set-output name=BUILD_TAG::$BUILD_TAG
3737
echo ::set-output name=BUILD_DATE::$BUILD_DATE
38-
38+
3939
- name: Read manifest.json
4040
id: manifest
4141
run: |
@@ -48,8 +48,9 @@ jobs:
4848
echo ::set-output name=UI_RELEASE::$(cat manifest.json | jq -r '.ui.release')
4949
5050
- name: Build and push
51-
uses: docker/build-push-action@v2
51+
uses: docker/build-push-action@v4
5252
with:
53+
provenance: false
5354
context: ./
5455
file: ./Dockerfile
5556
builder: ${{ steps.buildx.outputs.name }}
@@ -69,4 +70,4 @@ jobs:
6970
SOLIDITY_BUILDER_TAG=${{ steps.manifest.outputs.SOLIDITY_BUILDER_TAG }}
7071
BASE_TAG=${{ steps.manifest.outputs.BASE_TAG }}
7172
UI_TAG=${{ steps.manifest.outputs.UI_TAG }}
72-
UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }}
73+
UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }}

.github/workflows/docker_release.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
registry: ghcr.io
2626
username: ${{ github.actor }}
2727
password: ${{ secrets.GITHUB_TOKEN }}
28-
28+
2929
- name: Set latest tag
3030
if: github.event.action == 'released'
3131
run: |
@@ -34,17 +34,17 @@ jobs:
3434
- name: Set alpha tag
3535
if: github.event.action == 'prereleased' && contains(github.ref, 'alpha')
3636
run: |
37-
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:alpha" >> $GITHUB_ENV
37+
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:alpha" >> $GITHUB_ENV
3838
3939
- name: Set beta tag
4040
if: github.event.action == 'prereleased' && contains(github.ref, 'beta')
4141
run: |
42-
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:beta" >> $GITHUB_ENV
42+
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:beta" >> $GITHUB_ENV
4343
4444
- name: Set rc tag
4545
if: github.event.action == 'prereleased' && contains(github.ref, 'rc')
4646
run: |
47-
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:rc" >> $GITHUB_ENV
47+
echo "DOCKER_TAGS=${{ env.DOCKER_TAGS }},ghcr.io/${{ github.repository_owner }}/firefly:rc" >> $GITHUB_ENV
4848
4949
- name: Set build tag
5050
id: build_tag_generator
@@ -67,8 +67,9 @@ jobs:
6767
echo ::set-output name=UI_RELEASE::$(cat manifest.json | jq -r '.ui.release')
6868
6969
- name: Build and push
70-
uses: docker/build-push-action@v2
70+
uses: docker/build-push-action@v4
7171
with:
72+
provenance: false
7273
context: ./
7374
file: ./Dockerfile
7475
builder: ${{ steps.buildx.outputs.name }}
@@ -88,4 +89,4 @@ jobs:
8889
SOLIDITY_BUILDER_TAG=${{ steps.manifest.outputs.SOLIDITY_BUILDER_TAG }}
8990
BASE_TAG=${{ steps.manifest.outputs.BASE_TAG }}
9091
UI_TAG=${{ steps.manifest.outputs.UI_TAG }}
91-
UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }}
92+
UI_RELEASE=${{ steps.manifest.outputs.UI_RELEASE }}

0 commit comments

Comments
 (0)