Skip to content

Commit 00601c1

Browse files
CodeChanningCodeChanning
committed
feat: support for --sig-proxy in run
Signed-off-by: CodeChanning <[email protected]>
1 parent a7dde33 commit 00601c1

File tree

127 files changed

+2854
-1173
lines changed

Some content is hidden

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

127 files changed

+2854
-1173
lines changed

‎.github/workflows/ghcr-image-build-and-publish.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ on:
1212
tags: ['v*.*.*']
1313
pull_request:
1414
branches: [main]
15+
paths-ignore:
16+
- '**.md'
1517

1618
env:
1719
# Use docker.io for Docker Hub if empty
@@ -30,7 +32,7 @@ jobs:
3032

3133
steps:
3234
- name: Checkout repository
33-
uses: actions/[email protected].6
35+
uses: actions/[email protected].7
3436

3537
- name: Set up QEMU
3638
uses: docker/setup-qemu-action@v3
@@ -42,7 +44,7 @@ jobs:
4244
# https://github.com/docker/login-action
4345
- name: Log into registry ${{ env.REGISTRY }}
4446
if: github.event_name != 'pull_request'
45-
uses: docker/login-action@v3.1.0
47+
uses: docker/login-action@v3.2.0
4648
with:
4749
registry: ${{ env.REGISTRY }}
4850
username: ${{ github.actor }}
@@ -59,7 +61,7 @@ jobs:
5961
# Build and push Docker image with Buildx (don't push on PR)
6062
# https://github.com/docker/build-push-action
6163
- name: Build and push Docker image
62-
uses: docker/build-push-action@v5.3.0
64+
uses: docker/build-push-action@v6.1.0
6365
with:
6466
context: .
6567
platforms: linux/amd64,linux/arm64

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-22.04
1313
timeout-minutes: 40
1414
steps:
15-
- uses: actions/[email protected].6
15+
- uses: actions/[email protected].7
1616
- uses: actions/setup-go@v5
1717
with:
1818
go-version: 1.22.x

‎.github/workflows/test.yml

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ on:
66
- main
77
- 'release/**'
88
pull_request:
9+
paths-ignore:
10+
- '**.md'
911

1012
env:
1113
GO_VERSION: 1.22.x
@@ -16,7 +18,7 @@ jobs:
1618
runs-on: ubuntu-22.04
1719
timeout-minutes: 20
1820
steps:
19-
- uses: actions/[email protected].6
21+
- uses: actions/[email protected].7
2022
with:
2123
path: src/github.com/containerd/nerdctl
2224
fetch-depth: 100
@@ -37,7 +39,7 @@ jobs:
3739
runs-on: ubuntu-22.04
3840
timeout-minutes: 20
3941
steps:
40-
- uses: actions/[email protected].6
42+
- uses: actions/[email protected].7
4143
with:
4244
fetch-depth: 1
4345
- uses: actions/setup-go@v5
@@ -48,7 +50,7 @@ jobs:
4850
- name: golangci-lint
4951
uses: golangci/[email protected]
5052
with:
51-
version: v1.55.2
53+
version: v1.59.1
5254
args: --verbose
5355
- name: yamllint-lint
5456
run: yamllint .
@@ -57,7 +59,7 @@ jobs:
5759
runs-on: ubuntu-22.04
5860
timeout-minutes: 20
5961
steps:
60-
- uses: actions/[email protected].6
62+
- uses: actions/[email protected].7
6163
with:
6264
fetch-depth: 1
6365
- uses: actions/setup-go@v5
@@ -77,18 +79,18 @@ jobs:
7779
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
7880
include:
7981
- ubuntu: 20.04
80-
containerd: v1.6.31
82+
containerd: v1.6.33
8183
- ubuntu: 20.04
82-
containerd: v1.7.16
84+
containerd: v1.7.18
8385
- ubuntu: 22.04
84-
containerd: v1.7.16
86+
containerd: v1.7.18
8587
- ubuntu: 22.04
86-
containerd: main
88+
containerd: main # v2.0.0-rc.X
8789
env:
8890
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
8991
CONTAINERD_VERSION: "${{ matrix.containerd }}"
9092
steps:
91-
- uses: actions/[email protected].6
93+
- uses: actions/[email protected].7
9294
with:
9395
fetch-depth: 1
9496
- name: "Prepare integration test environment"
@@ -118,12 +120,12 @@ jobs:
118120
# ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2
119121
include:
120122
- ubuntu: 22.04
121-
containerd: v1.7.16
123+
containerd: v1.7.18
122124
env:
123125
UBUNTU_VERSION: "${{ matrix.ubuntu }}"
124126
CONTAINERD_VERSION: "${{ matrix.containerd }}"
125127
steps:
126-
- uses: actions/[email protected].6
128+
- uses: actions/[email protected].7
127129
with:
128130
fetch-depth: 1
129131
- name: Enable ipv4 and ipv6 forwarding
@@ -167,35 +169,35 @@ jobs:
167169
# ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2
168170
include:
169171
- ubuntu: 20.04
170-
containerd: v1.6.31
172+
containerd: v1.6.33
171173
rootlesskit: v1.1.1
172174
target: test-integration-rootless
173175
- ubuntu: 20.04
174-
containerd: v1.7.16
176+
containerd: v1.7.18
175177
rootlesskit: v2.1.0
176178
target: test-integration-rootless
177179
- ubuntu: 22.04
178-
containerd: v1.7.16
180+
containerd: v1.7.18
179181
rootlesskit: v1.1.1
180182
target: test-integration-rootless
181183
- ubuntu: 22.04
182-
containerd: main
184+
containerd: main # v2.0.0-rc.X
183185
rootlesskit: v2.1.0
184186
target: test-integration-rootless
185187
- ubuntu: 20.04
186-
containerd: v1.6.31
188+
containerd: v1.6.33
187189
rootlesskit: v1.1.1
188190
target: test-integration-rootless-port-slirp4netns
189191
- ubuntu: 20.04
190-
containerd: v1.7.16
192+
containerd: v1.7.18
191193
rootlesskit: v2.1.0
192194
target: test-integration-rootless-port-slirp4netns
193195
- ubuntu: 22.04
194-
containerd: v1.7.16
196+
containerd: v1.7.18
195197
rootlesskit: v1.1.1
196198
target: test-integration-rootless-port-slirp4netns
197199
- ubuntu: 22.04
198-
containerd: main
200+
containerd: main # v2.0.0-rc.X
199201
rootlesskit: v2.1.0
200202
target: test-integration-rootless-port-slirp4netns
201203
env:
@@ -204,7 +206,7 @@ jobs:
204206
ROOTLESSKIT_VERSION: "${{ matrix.rootlesskit }}"
205207
TEST_TARGET: "${{ matrix.target }}"
206208
steps:
207-
- uses: actions/[email protected].6
209+
- uses: actions/[email protected].7
208210
with:
209211
fetch-depth: 1
210212
- name: "Register QEMU (tonistiigi/binfmt)"
@@ -226,7 +228,7 @@ jobs:
226228
matrix:
227229
go-version: ["1.21.x", "1.22.x"]
228230
steps:
229-
- uses: actions/[email protected].6
231+
- uses: actions/[email protected].7
230232
with:
231233
fetch-depth: 1
232234
- uses: actions/setup-go@v5
@@ -235,29 +237,39 @@ jobs:
235237
cache: true
236238
check-latest: true
237239
- name: "Cross"
238-
run: GO_VERSION="$(echo ${{ matrix.go-version }} | sed -e s/.x//)" make artifacts
240+
run: GO_VERSION="$(echo ${{ matrix.go-version }} | sed -e s/.x//)" make binaries
239241

240242
test-integration-docker-compatibility:
241243
runs-on: ubuntu-22.04
242244
timeout-minutes: 45
243245
steps:
244-
- uses: actions/[email protected].6
246+
- uses: actions/[email protected].7
245247
with:
246248
fetch-depth: 1
247249
- uses: actions/setup-go@v5
248250
with:
249251
go-version: ${{ env.GO_VERSION }}
250252
cache: true
251253
check-latest: true
252-
- name: "Enable BuildKit"
254+
- name: "Install Docker v26"
253255
run: |
254256
set -eux -o pipefail
257+
# Uninstall the preinstalled Docker
258+
sudo apt-get remove docker-* containerd.io
255259
# Enable BuildKit explicitly
256260
sudo apt-get install -y moreutils
257261
cat /etc/docker/daemon.json
258262
jq '.features.buildkit = true' </etc/docker/daemon.json | sudo sponge /etc/docker/daemon.json
259263
cat /etc/docker/daemon.json
260-
sudo systemctl restart docker
264+
# Download Docker packages
265+
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/containerd.io_1.6.33-1_amd64.deb
266+
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-ce_26.1.4-1~ubuntu.22.04~jammy_amd64.deb
267+
curl -OSl https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-ce-cli_26.1.4-1~ubuntu.22.04~jammy_amd64.deb
268+
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-buildx-plugin_0.14.1-1~ubuntu.22.04~jammy_amd64.deb
269+
curl -OSL https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64/docker-compose-plugin_2.27.1-1~ubuntu.22.04~jammy_amd64.deb
270+
# Install Docker
271+
sudo apt-get install -y ./*.deb
272+
rm -f ./*.deb
261273
# Print docker info
262274
docker info
263275
docker version
@@ -288,7 +300,7 @@ jobs:
288300
run:
289301
shell: bash
290302
steps:
291-
- uses: actions/[email protected].6
303+
- uses: actions/[email protected].7
292304
with:
293305
fetch-depth: 1
294306
- uses: actions/setup-go@v5
@@ -297,18 +309,18 @@ jobs:
297309
cache: true
298310
check-latest: true
299311
- run: go install ./cmd/nerdctl
300-
- uses: actions/[email protected].6
312+
- uses: actions/[email protected].7
301313
with:
302314
repository: containerd/containerd
303-
ref: v1.7.16
315+
ref: v1.7.18
304316
path: containerd
305317
fetch-depth: 1
306318
- name: "Set up CNI"
307319
working-directory: containerd
308320
run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows
309321
- name: "Set up containerd"
310322
env:
311-
ctrdVersion: 1.7.16
323+
ctrdVersion: 1.7.18
312324
run: powershell hack/configure-windows-ci.ps1
313325
# TODO: Run unit tests
314326
- name: "Run integration tests"
@@ -320,7 +332,7 @@ jobs:
320332
timeout-minutes: 20
321333

322334
steps:
323-
- uses: actions/[email protected].6
335+
- uses: actions/[email protected].7
324336
- uses: actions/cache@v4
325337
with:
326338
path: /root/.vagrant.d

‎.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
run:
33
concurrency: 6
4-
deadline: 5m
54
linters:
65
disable-all: true
76
enable:

‎Dockerfile

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
# TODO: verify commit hash
1919

2020
# Basic deps
21-
ARG CONTAINERD_VERSION=v1.7.16
22-
ARG RUNC_VERSION=v1.1.12
23-
ARG CNI_PLUGINS_VERSION=v1.4.1
21+
ARG CONTAINERD_VERSION=v2.0.0-rc.3
22+
ARG RUNC_VERSION=v1.1.13
23+
ARG CNI_PLUGINS_VERSION=v1.5.1
2424

2525
# Extra deps: Build
26-
ARG BUILDKIT_VERSION=v0.13.2
26+
ARG BUILDKIT_VERSION=v0.14.1
2727
# Extra deps: Lazy-pulling
2828
ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1
2929
# Extra deps: Encryption
30-
ARG IMGCRYPT_VERSION=v1.1.10
30+
ARG IMGCRYPT_VERSION=v1.1.11
3131
# Extra deps: Rootless
3232
ARG ROOTLESSKIT_VERSION=v2.1.0
33-
ARG SLIRP4NETNS_VERSION=v1.3.0
33+
ARG SLIRP4NETNS_VERSION=v1.3.1
3434
# Extra deps: bypass4netns
3535
ARG BYPASS4NETNS_VERSION=v0.4.1
3636
# Extra deps: FUSE-OverlayFS
3737
ARG FUSE_OVERLAYFS_VERSION=v1.13
3838
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8
3939
# Extra deps: IPFS
40-
ARG KUBO_VERSION=v0.27.0
40+
ARG KUBO_VERSION=v0.29.0
4141
# Extra deps: Init
4242
ARG TINI_VERSION=v0.19.0
4343
# Extra deps: Debug
@@ -47,9 +47,9 @@ ARG BUILDG_VERSION=v0.4.1
4747
ARG GO_VERSION=1.22
4848
ARG UBUNTU_VERSION=22.04
4949
ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1
50-
ARG GOTESTSUM_VERSION=v1.11.0
51-
ARG NYDUS_VERSION=v2.2.4
52-
ARG SOCI_SNAPSHOTTER_VERSION=0.4.0
50+
ARG GOTESTSUM_VERSION=v1.12.0
51+
ARG NYDUS_VERSION=v2.2.5
52+
ARG SOCI_SNAPSHOTTER_VERSION=0.6.1
5353

5454
FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx
5555

@@ -65,18 +65,6 @@ ARG TARGETARCH
6565
RUN xx-apt-get update && \
6666
xx-apt-get install -y binutils gcc libc6-dev libbtrfs-dev libseccomp-dev
6767

68-
# runc still requires Go 1.21
69-
# https://github.com/opencontainers/runc/issues/4233
70-
FROM --platform=$BUILDPLATFORM golang:1.21-bullseye AS build-base-debian-go121
71-
COPY --from=xx / /
72-
ENV DEBIAN_FRONTEND=noninteractive
73-
RUN apt-get update && \
74-
apt-get install -y git pkg-config dpkg-dev
75-
ARG TARGETARCH
76-
# libseccomp: for runc
77-
RUN xx-apt-get update && \
78-
xx-apt-get install -y binutils gcc libc6-dev libseccomp-dev
79-
8068
FROM build-base-debian AS build-containerd
8169
ARG TARGETARCH
8270
ARG CONTAINERD_VERSION
@@ -88,9 +76,7 @@ RUN git checkout ${CONTAINERD_VERSION} && \
8876
RUN GO=xx-go make STATIC=1 && \
8977
cp -a bin/containerd bin/containerd-shim-runc-v2 bin/ctr /out/$TARGETARCH
9078

91-
# runc still requires Go 1.21
92-
# https://github.com/opencontainers/runc/issues/4233
93-
FROM build-base-debian-go121 AS build-runc
79+
FROM build-base-debian AS build-runc
9480
ARG RUNC_VERSION
9581
ARG TARGETARCH
9682
RUN git clone https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc

‎Dockerfile.d/SHA256SUMS.d/buildkit-v0.13.2

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

‎Dockerfile.d/SHA256SUMS.d/buildkit-v0.14.1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
836208f50ab8856a91aa5bba455b8451bbe261318cbc92e9c0ca3e786135756c buildkit-v0.14.1.linux-amd64.tar.gz
2+
e1caad39f0bc5848a5687d7a0e8e344d20724133365596e5d881d8fbe5594b32 buildkit-v0.14.1.linux-arm64.tar.gz

‎Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.4.1

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

‎Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.0

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
57a18478422cb321370e30a5ee6ce026321289cd9c94353ca697dddd7714f1a5 cni-plugins-linux-amd64-v1.5.0.tgz
2+
ab38507efe50c34bc2242a25c5783c19fdfe0376c65a2a91d48174d4f39f1fc2 cni-plugins-linux-arm64-v1.5.0.tgz

‎Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.5.1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
77baa2f669980a82255ffa2f2717de823992480271ee778aa51a9c60ae89ff9b cni-plugins-linux-amd64-v1.5.1.tgz
2+
c2a292714d0fad98a3491ae43df8ad58354b3c0bdf5d5a3e281777967c70fcff cni-plugins-linux-arm64-v1.5.1.tgz

‎Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.3.0

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

‎Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.3.1

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2dd9aac6c2e3203e53cb7b6e4b9fc7123e4e4a9716c8bb1d95951853059a6af5 slirp4netns-aarch64
2+
ed618c0f2c74014bb736e9e427e18c8791ad9d68311872a41b06fac0d7cb9ef2 slirp4netns-armv7l
3+
a10f70209cee0dd0532fea0e8b6bfde5d16dec5206fd4b3387d861721456de66 slirp4netns-ppc64le
4+
38209015c2f3f4619d9fc46610852887910f33c7a0b96f7d2aa835a7bbc73f31 slirp4netns-riscv64
5+
9f42718455b1f9cf4b6f0efee314b78e860b8c36dbbb6290f09c8fbedda9ff8a slirp4netns-s390x
6+
4bc5d6c311f9fa7ae00ce54aefe10c2afaf0800fe9e99f32616a964ed804a9e1 slirp4netns-x86_64

0 commit comments

Comments
 (0)