Skip to content

Commit 9ce20e9

Browse files
pdabelf5pdabelf5
authored
Merge branch 'main' into dependabot/docker/build/nginxinc/dependencies/nginx-ot-616b701
2 parents 795684d + c4c6114 commit 9ce20e9

File tree

16 files changed

+75
-18
lines changed

16 files changed

+75
-18
lines changed

‎.github/actions/certify-openshift-image/action.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ inputs:
1818
platforms:
1919
description: A comma separated list of architectures in the image manifest to certify
2020
required: false
21-
default: ""
21+
default: "amd64,arm64,ppc64le,s390x"
22+
submit:
23+
description: Submit results to Redhat PYAXIS
24+
required: false
25+
default: true
2226

2327
outputs:
2428
result:
@@ -43,14 +47,14 @@ runs:
4347
IFS=',' read -ra arch_list <<< "${{ inputs.platforms }}"
4448
for arch in "${arch_list[@]}"; do
4549
architecture=("${arch#*/}")
46-
./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} --platform $architecture --submit
50+
./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} --platform $architecture ${{ inputs.submit && '--submit' || '' }}
4751
if [ $? -ne 0 ]; then
4852
result=1
4953
fi
5054
done
5155
else
5256
# no platforms passed, this is either a manifest or a single platform image
53-
./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} --submit
57+
./preflight check container ${{ inputs.image }} --pyxis-api-token ${{ inputs.pyxis_token }} --certification-project-id ${{ inputs.project_id }} ${{ inputs.submit && '--submit' || '' }}
5458
result=$?
5559
fi
5660
echo "result=$result" >> $GITHUB_OUTPUT

‎.github/scripts/exclude_ci_files.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
.github/workflows/build-ubi-dependency.yml
1919
.github/workflows/build-single-image.yml
2020
.github/workflows/cache-update.yml
21+
.github/workflows/certify-ubi-image.yml
2122
.github/workflows/cherry-pick.yml
2223
.github/workflows/codeql-analysis.yml
2324
.github/workflows/create-release-branch.yml

‎.github/workflows/build-base-images.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5959

6060
- name: Docker Buildx
61-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
61+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
6262

6363
- name: Setup QEMU
6464
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
@@ -123,7 +123,7 @@ jobs:
123123
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
124124

125125
- name: Docker Buildx
126-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
126+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
127127

128128
- name: Setup QEMU
129129
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
@@ -191,7 +191,7 @@ jobs:
191191
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
192192

193193
- name: Docker Buildx
194-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
194+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
195195

196196
- name: Authenticate to Google Cloud
197197
id: auth

‎.github/workflows/build-oss.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
120120

121121
- name: Docker Buildx
122-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
122+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
123123
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
124124

125125
- name: Build Base Container

‎.github/workflows/build-ot-dependency.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
platforms: arm,arm64,ppc64le,s390x
5656

5757
- name: Docker Buildx
58-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
58+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
5959
with:
6060
buildkitd-flags: --debug
6161

‎.github/workflows/build-plus.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ jobs:
126126
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
127127

128128
- name: Docker Buildx
129-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
129+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
130130
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
131131

132132
- name: Build Base Container

‎.github/workflows/build-test-image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232

3333
- name: Docker Buildx
34-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
34+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
3535

3636
- name: Authenticate to Google Cloud
3737
id: auth

‎.github/workflows/build-ubi-dependency.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
platforms: arm64,ppc64le,s390x
9898

9999
- name: Docker Buildx
100-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
100+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
101101

102102
- name: Login to GitHub Container Registry
103103
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0

‎.github/workflows/certify-ubi-image.yml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Certify UBI image
2+
run-name: Certify UBI image ${{ inputs.image }} by @${{ github.actor }}
3+
4+
on:
5+
workflow_dispatch:
6+
inputs:
7+
image:
8+
description: "Image to certify"
9+
required: true
10+
type: string
11+
submit:
12+
description: "Submit results to Redhat"
13+
required: false
14+
type: boolean
15+
default: false
16+
preflight_version:
17+
description: "Preflight version to use"
18+
required: false
19+
type: string
20+
default: "1.11.1"
21+
platforms:
22+
description: A comma separated list of architectures in the image manifest to certify
23+
required: false
24+
default: "amd64,arm64,ppc64le,s390x"
25+
26+
defaults:
27+
run:
28+
shell: bash
29+
30+
permissions:
31+
contents: read
32+
33+
jobs:
34+
certify-ubi-images:
35+
name: Certify OpenShift UBI images
36+
runs-on: ubuntu-24.04
37+
steps:
38+
- name: Checkout
39+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
40+
41+
- name: Certify UBI OSS images in quay
42+
uses: ./.github/actions/certify-openshift-image
43+
with:
44+
image: ${{ inputs.image }}
45+
project_id: ${{ secrets.CERTIFICATION_PROJECT_ID }}
46+
pyxis_token: ${{ secrets.PYXIS_API_TOKEN }}
47+
preflight_version: ${{ inputs.preflight_version }}
48+
submit: ${{ inputs.submit || true }}
49+
platforms: ${{ inputs.platforms }}

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ jobs:
439439
if: ${{ needs.checks.outputs.forked_workflow == 'true' && needs.checks.outputs.docs_only == 'false' }}
440440

441441
- name: Docker Buildx
442-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
442+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
443443
if: ${{ needs.checks.outputs.forked_workflow == 'true' && needs.checks.outputs.docs_only == 'false' }}
444444

445445
- name: Build Docker Image ${{ matrix.base-os }}
@@ -537,7 +537,7 @@ jobs:
537537
echo "matrix_nap=$(cat .github/data/matrix-smoke-nap.json | jq -c --arg latest "${{ needs.checks.outputs.k8s_latest }}" '.k8s += [$latest]')" >> $GITHUB_OUTPUT
538538
539539
- name: Docker Buildx
540-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
540+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
541541

542542
- name: Authenticate to Google Cloud
543543
id: auth

0 commit comments

Comments
 (0)