Skip to content

Commit 5cfc83f

Browse files
jjngxjjngx
authored
Merge branch 'main' into ff20250312
2 parents 211d861 + dba09e1 commit 5cfc83f

File tree

80 files changed

+2133
-673
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+2133
-673
lines changed

‎.github/data/matrix-images-oss.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
"alpine"
55
],
66
"platforms": [
7-
"linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
7+
"linux/arm64, linux/amd64"
88
],
99
"include": [
1010
{
1111
"image": "ubi",
12-
"platforms": "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
12+
"platforms": "linux/arm64, linux/amd64"
1313
}
1414
]
1515
}

‎.github/data/matrix-regression.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"image": "debian",
77
"type": "oss",
88
"marker": "'not upgrade'",
9-
"platforms": "linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"
9+
"platforms": "linux/arm64, linux/amd64"
1010
},
1111
{
1212
"label": "regression",

‎.github/data/matrix-smoke-nap.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"image": "debian-plus-nap",
7070
"type": "plus",
7171
"nap_modules": "waf",
72-
"marker": "agent",
72+
"marker": "agentv2",
7373
"platforms": "linux/amd64"
7474
}
7575
],

‎.github/scripts/variables.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ if [ "$PWD" != "$ROOTDIR" ]; then
1313
fi
1414

1515
get_docker_md5() {
16-
docker_md5=$(find build .github/data/version.txt -type f ! -name "*.md" -exec md5sum {} + | LC_ALL=C sort | md5sum | awk '{ print $1 }')
16+
docker_md5=$(find build .github/data/version.txt internal/configs/njs internal/configs/oidc -type f ! -name "*.md" -exec md5sum {} + | LC_ALL=C sort | md5sum | awk '{ print $1 }')
1717
echo "${docker_md5:0:8}"
1818
}
1919

2020
get_go_code_md5() {
21-
find . -type f \( -name "*.go" -o -name go.mod -o -name go.sum -o -name "*.tmpl" -o -name "version.txt" -o -name "*.js" \) -not -path "./site*" -exec md5sum {} + | LC_ALL=C sort | md5sum | awk '{ print $1 }'
21+
find . -type f \( -name "*.go" -o -name go.mod -o -name go.sum -o -name "*.tmpl" -o -name "version.txt" \) -not -path "./site*" -exec md5sum {} + | LC_ALL=C sort | md5sum | awk '{ print $1 }'
2222
}
2323

2424
get_tests_md5() {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: Setup QEMU
6464
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
6565
with:
66-
platforms: arm,arm64,ppc64le,s390x
66+
platforms: arm64
6767

6868
- name: Authenticate to Google Cloud
6969
id: auth
@@ -92,7 +92,7 @@ jobs:
9292
type=raw,value=${{ needs.checks.outputs.docker_md5 }},enable=${{ needs.checks.outputs.docker_md5 != '' }}
9393
9494
- name: Build Base Container
95-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
95+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
9696
with:
9797
file: build/Dockerfile
9898
context: "."
@@ -128,7 +128,7 @@ jobs:
128128
- name: Setup QEMU
129129
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
130130
with:
131-
platforms: arm64,s390x
131+
platforms: arm64
132132

133133
- name: Authenticate to Google Cloud
134134
id: auth
@@ -157,7 +157,7 @@ jobs:
157157
type=raw,value=${{ needs.checks.outputs.docker_md5 }},enable=${{ needs.checks.outputs.docker_md5 != '' }}
158158
159159
- name: Build Base Container
160-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
160+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
161161
with:
162162
file: build/Dockerfile
163163
context: "."
@@ -229,7 +229,7 @@ jobs:
229229
type=raw,value=${{ needs.checks.outputs.docker_md5 }},enable=${{ needs.checks.outputs.docker_md5 != '' }}
230230
231231
- name: Build Base Container
232-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
232+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
233233
with:
234234
file: build/Dockerfile
235235
context: "."

‎.github/workflows/build-oss.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@ jobs:
115115
- name: Setup QEMU
116116
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
117117
with:
118-
platforms: arm,arm64,ppc64le,s390x
118+
platforms: arm64
119119
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
120120

121121
- name: Docker Buildx
122122
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
123123
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
124124

125125
- name: Build Base Container
126-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
126+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
127127
with:
128128
file: build/Dockerfile
129129
context: "."
@@ -155,7 +155,7 @@ jobs:
155155
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
156156

157157
- name: Build Docker image
158-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
158+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
159159
id: build-push
160160
with:
161161
file: build/Dockerfile
@@ -201,7 +201,7 @@ jobs:
201201

202202
- name: Run Docker Scout vulnerability scanner
203203
id: docker-scout
204-
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
204+
uses: docker/scout-action@aceeb83b88f2ae54376891227858dda7af647183 # v1.18.1
205205
with:
206206
command: cves
207207
image: ${{ steps.meta.outputs.tags }}

‎.github/workflows/build-plus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,15 +122,15 @@ jobs:
122122
- name: Setup QEMU
123123
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
124124
with:
125-
platforms: arm,arm64,ppc64le,s390x
125+
platforms: arm64
126126
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
127127

128128
- name: Docker Buildx
129129
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
130130
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
131131

132132
- name: Build Base Container
133-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
133+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
134134
with:
135135
file: build/Dockerfile
136136
context: "."
@@ -168,7 +168,7 @@ jobs:
168168
if: ${{ steps.images_exist.outputs.base_exists != 'true' || steps.images_exist.outputs.target_exists != 'true' }}
169169

170170
- name: Build Docker image
171-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
171+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
172172
id: build-push
173173
with:
174174
file: build/Dockerfile
@@ -222,7 +222,7 @@ jobs:
222222

223223
- name: Run Docker Scout vulnerability scanner
224224
id: docker-scout
225-
uses: docker/scout-action@381b657c498a4d287752e7f2cfb2b41823f566d9 # v1.17.1
225+
uses: docker/scout-action@aceeb83b88f2ae54376891227858dda7af647183 # v1.18.1
226226
with:
227227
command: cves
228228
image: ${{ steps.meta.outputs.tags }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
fetch-depth: 0
5252

5353
- name: Setup Golang Environment
54-
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
54+
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5555
with:
5656
go-version-file: go.mod
5757

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
password: ${{ steps.auth.outputs.access_token }}
5050

5151
- name: Build Test-Runner Container
52-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
52+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
5353
with:
5454
file: tests/Dockerfile
5555
context: "."

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ jobs:
9494
- name: Setup QEMU
9595
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
9696
with:
97-
platforms: arm64,ppc64le,s390x
97+
platforms: arm64
9898

9999
- name: Docker Buildx
100100
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
@@ -118,15 +118,15 @@ jobs:
118118
DOCKER_METADATA_ANNOTATIONS_LEVELS: manifest,index
119119

120120
- name: Build and push
121-
uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6.16.0
121+
uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
122122
with:
123123
file: ./build/dependencies/Dockerfile.ubi
124124
context: "."
125125
pull: true
126126
push: true
127127
# build multi-arch so that it can be mounted from any image
128128
# even though only ppc64le will contain binaries
129-
platforms: "linux/amd64,linux/arm64,linux/ppc64le,linux/s390x"
129+
platforms: "linux/amd64,linux/arm64"
130130
tags: ${{ steps.meta.outputs.tags }}
131131
labels: ${{ steps.meta.outputs.labels }}
132132
annotations: ${{ steps.meta.outputs.annotations }}

0 commit comments

Comments
 (0)