Skip to content

Commit 6d4ff72

Browse files
author
Pat
authored
workflows: disable provenance for legacy format images (#7766)
* workflows: disable provenance for legacy format images Signed-off-by: Patrick Stephens <[email protected]> * workflows: disable provenance for legacy format images Signed-off-by: Patrick Stephens <[email protected]> --------- Signed-off-by: Patrick Stephens <[email protected]>
1 parent 776143e commit 6d4ff72

File tree

5 files changed

+17
-6
lines changed

5 files changed

+17
-6
lines changed

.github/workflows/build-legacy-branch.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ jobs:
8686
context: .
8787
tags: ${{ steps.debug-meta.outputs.tags }}
8888
labels: ${{ steps.debug-meta.outputs.labels }}
89+
provenance: false
8990
platforms: linux/amd64
9091
push: true
9192
load: false
@@ -108,6 +109,7 @@ jobs:
108109
tags: ${{ steps.meta.outputs.tags }}
109110
labels: ${{ steps.meta.outputs.labels }}
110111
platforms: linux/${{ matrix.arch }}
112+
provenance: false
111113
push: true
112114
load: false
113115
build-args: |

.github/workflows/call-build-images.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ jobs:
122122
labels: ${{ steps.meta.outputs.labels }}
123123
platforms: linux/amd64, linux/arm64, linux/arm/v7
124124
target: production
125+
# Must be disabled to provide legacy format images from the registry
126+
provenance: false
125127
push: true
126128
load: false
127129
build-args: |
@@ -146,6 +148,8 @@ jobs:
146148
tags: ${{ steps.debug-meta.outputs.tags }}
147149
labels: ${{ steps.debug-meta.outputs.labels }}
148150
platforms: linux/amd64, linux/arm64, linux/arm/v7
151+
# Must be disabled to provide legacy format images from the registry
152+
provenance: false
149153
target: debug
150154
push: true
151155
load: false
@@ -285,7 +289,7 @@ jobs:
285289
strategy:
286290
fail-fast: true
287291
matrix:
288-
windows-base-version:
292+
windows-base-version:
289293
- '2019'
290294
- '2022'
291295
permissions:
@@ -308,7 +312,7 @@ jobs:
308312
run: |
309313
docker build -t ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }} --build-arg FLB_NIGHTLY_BUILD=${{ inputs.unstable }} --build-arg WINDOWS_VERSION=ltsc${{ matrix.windows-base-version }} -f ./dockerfiles/Dockerfile.windows .
310314
docker push ${{ inputs.registry }}/${{ inputs.image }}:windows-${{ matrix.windows-base-version }}-${{ inputs.version }}
311-
315+
312316
# We cannot use this action as it requires privileged mode
313317
# uses: docker/build-push-action@v4
314318
# with:

.github/workflows/call-integration-image-build.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ jobs:
7070
labels: ${{ steps.meta.outputs.labels }}
7171
platforms: linux/amd64
7272
target: production
73+
provenance: false
7374
push: true
7475
load: false
7576

@@ -103,6 +104,7 @@ jobs:
103104
context: .
104105
tags: ${{ steps.meta-debug.outputs.tags }}
105106
labels: ${{ steps.meta-debug.outputs.labels }}
107+
provenance: false
106108
target: debug
107109
platforms: linux/amd64
108110
push: true

.github/workflows/pr-compile-check.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ jobs:
2929
# No need to use after this so discard completely
3030
push: false
3131
load: false
32+
provenance: false

.github/workflows/pr-image-tests.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
images: ${{ github.repository }}/pr-${{ github.event.pull_request.number }}
3434
tags: |
3535
type=sha
36-
36+
3737
- name: Build the multi-arch images
3838
id: build
3939
uses: docker/build-push-action@v4
@@ -42,6 +42,7 @@ jobs:
4242
context: .
4343
platforms: linux/amd64
4444
target: production
45+
provenance: false
4546
push: false
4647
load: true
4748
tags: ${{ steps.meta.outputs.tags }}
@@ -52,14 +53,15 @@ jobs:
5253
run: |
5354
docker run --rm -t ${{ steps.meta.outputs.tags }} --help
5455
shell: bash
55-
56+
5657
- name: Build the debug multi-arch images
5758
uses: docker/build-push-action@v4
5859
with:
5960
file: ./dockerfiles/Dockerfile
6061
context: .
6162
platforms: linux/amd64
6263
target: debug
64+
provenance: false
6365
push: false
6466
load: false
6567

@@ -86,7 +88,7 @@ jobs:
8688
strategy:
8789
fail-fast: true
8890
matrix:
89-
windows-base-version:
91+
windows-base-version:
9092
# https://github.com/fluent/fluent-bit/blob/1d366594a889624ec3003819fe18588aac3f17cd/dockerfiles/Dockerfile.windows#L3
9193
- '2019'
9294
- '2022'
@@ -105,7 +107,7 @@ jobs:
105107
type=sha
106108
flavor: |
107109
suffix=-windows-${{ matrix.windows-base-version }}
108-
110+
109111
- name: Build the windows images
110112
id: build
111113
run: |

0 commit comments

Comments
 (0)