Skip to content

Commit 2537f65

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 01d9099 + 0ade38f commit 2537f65

199 files changed

Lines changed: 27048 additions & 1591 deletions

File tree

Some content is hidden

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

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// docker-in-docker allows you to run Docker commands inside the dev container. Thus, it supports to build docker build in the environment.
1414
"ghcr.io/devcontainers/features/docker-in-docker:2": {
1515
"version": "latest",
16-
"moby": true,
16+
"moby": false,
1717
"dockerDashComposeVersion": "v1"
1818
}
1919
},

.github/scripts/commit_prefix_check.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import re
1717
import sys
1818
from git import Repo
19+
from git.exc import GitCommandError
1920

2021
repo = Repo(".")
2122

@@ -215,7 +216,15 @@ def validate_commit(commit):
215216
return False, "Missing Signed-off-by line"
216217

217218
# Determine expected prefixes + build option flag
218-
files = commit.stats.files.keys()
219+
try:
220+
files = commit.stats.files.keys()
221+
except GitCommandError as e:
222+
return False, (
223+
f"Could not inspect files changed by commit {commit.hexsha[:10]}: {e}\n"
224+
"The repository checkout is likely missing commit parent history. "
225+
"Use a full-depth checkout for commit-prefix validation."
226+
)
227+
219228
expected, build_optional = infer_prefix_from_paths(files)
220229

221230
# When no prefix can be inferred (docs/tools), allow anything

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

Lines changed: 0 additions & 27 deletions
This file was deleted.

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

Lines changed: 0 additions & 156 deletions
This file was deleted.

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,18 @@ jobs:
104104
token: ${{ secrets.token }}
105105

106106
- name: Set up Docker Buildx
107-
uses: docker/setup-buildx-action@v3
107+
uses: docker/setup-buildx-action@v4
108108

109109
- name: Log in to the Container registry
110-
uses: docker/login-action@v3
110+
uses: docker/login-action@v4
111111
with:
112112
registry: ${{ inputs.registry }}
113113
username: ${{ github.actor }}
114114
password: ${{ secrets.token }}
115115

116116
- name: Build and push by digest the standard ${{ matrix.target }} image
117117
id: build
118-
uses: docker/build-push-action@v6
118+
uses: docker/build-push-action@v7
119119
with:
120120
# Use path context rather than Git context as we want local files
121121
file: ./dockerfiles/Dockerfile
@@ -180,10 +180,10 @@ jobs:
180180
merge-multiple: true
181181

182182
- name: Set up Docker Buildx
183-
uses: docker/setup-buildx-action@v3
183+
uses: docker/setup-buildx-action@v4
184184

185185
- name: Log in to the Container registry
186-
uses: docker/login-action@v3
186+
uses: docker/login-action@v4
187187
with:
188188
registry: ${{ inputs.registry }}
189189
username: ${{ github.actor }}
@@ -232,10 +232,10 @@ jobs:
232232
merge-multiple: true
233233

234234
- name: Set up Docker Buildx
235-
uses: docker/setup-buildx-action@v3
235+
uses: docker/setup-buildx-action@v4
236236

237237
- name: Log in to the Container registry
238-
uses: docker/login-action@v3
238+
uses: docker/login-action@v4
239239
with:
240240
registry: ${{ inputs.registry }}
241241
username: ${{ github.actor }}
@@ -265,7 +265,7 @@ jobs:
265265
packages: read
266266
steps:
267267
- name: Log in to the Container registry
268-
uses: docker/login-action@v3
268+
uses: docker/login-action@v4
269269
with:
270270
registry: ${{ inputs.registry }}
271271
username: ${{ inputs.username }}
@@ -297,14 +297,14 @@ jobs:
297297
packages: read
298298
steps:
299299
- name: Log in to the Container registry
300-
uses: docker/login-action@v3
300+
uses: docker/login-action@v4
301301
with:
302302
registry: ${{ inputs.registry }}
303303
username: ${{ inputs.username }}
304304
password: ${{ secrets.token }}
305305

306306
- name: Trivy - multi-arch
307-
uses: aquasecurity/trivy-action@master
307+
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1
308308
with:
309309
image-ref: "${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.version }}"
310310
format: "table"
@@ -404,10 +404,10 @@ jobs:
404404
ref: ${{ inputs.ref }}
405405

406406
# - name: Set up Docker Buildx
407-
# uses: docker/setup-buildx-action@v3
407+
# uses: docker/setup-buildx-action@v4
408408

409409
- name: Log in to the Container registry
410-
uses: docker/login-action@v3
410+
uses: docker/login-action@v4
411411
with:
412412
registry: ${{ inputs.registry }}
413413
username: ${{ inputs.username }}
@@ -440,7 +440,7 @@ jobs:
440440
shell: bash
441441

442442
# We cannot use this action as it requires privileged mode
443-
# uses: docker/build-push-action@v6
443+
# uses: docker/build-push-action@v7
444444
# with:
445445
# file: ./dockerfiles/Dockerfile.windows
446446
# context: .

.github/workflows/call-build-linux-packages.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@ jobs:
120120
ref: ${{ inputs.ref }}
121121

122122
- name: Set up Docker Buildx
123-
uses: docker/setup-buildx-action@v3
123+
uses: docker/setup-buildx-action@v4
124124

125125
# Raspbian requires ARMv6 emulation
126126
- name: Set up QEMU
127127
if: contains(matrix.distro, 'raspbian')
128-
uses: docker/setup-qemu-action@v3
128+
uses: docker/setup-qemu-action@v4
129129
with:
130130
image: tonistiigi/binfmt:qemu-v7.0.0-28 # See: https://github.com/docker/setup-qemu-action/issues/198#issuecomment-2653791775
131131

@@ -237,7 +237,7 @@ jobs:
237237

238238
- name: Import GPG key for signing
239239
id: import_gpg
240-
uses: crazy-max/ghaction-import-gpg@v6
240+
uses: crazy-max/ghaction-import-gpg@v7
241241
with:
242242
gpg_private_key: ${{ secrets.gpg_private_key }}
243243
passphrase: ${{ secrets.gpg_private_key_passphrase }}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ jobs:
4444
ref: ${{ inputs.ref }}
4545

4646
- name: Set up Docker Buildx
47-
uses: docker/setup-buildx-action@v3
47+
uses: docker/setup-buildx-action@v4
4848

4949
- name: Log in to the Container registry
50-
uses: docker/login-action@v3
50+
uses: docker/login-action@v4
5151
with:
5252
registry: ${{ inputs.registry }}
5353
username: ${{ inputs.username }}
@@ -62,7 +62,7 @@ jobs:
6262
raw,${{ inputs.image-tag }}
6363
6464
- name: Build the AMD64 image
65-
uses: docker/build-push-action@v6
65+
uses: docker/build-push-action@v7
6666
with:
6767
file: ./dockerfiles/Dockerfile
6868
context: .
@@ -83,7 +83,7 @@ jobs:
8383
raw,${{ inputs.image-tag }}-debug
8484
8585
- name: Build the AMD64 debug image
86-
uses: docker/build-push-action@v6
86+
uses: docker/build-push-action@v7
8787
with:
8888
file: ./dockerfiles/Dockerfile
8989
context: .
@@ -110,7 +110,7 @@ jobs:
110110
ref: ${{ inputs.ref }}
111111

112112
- name: Log in to the Container registry
113-
uses: docker/login-action@v3
113+
uses: docker/login-action@v4
114114
with:
115115
registry: ${{ inputs.registry }}
116116
username: ${{ inputs.username }}

0 commit comments

Comments
 (0)