From 87e988e5559f4734fe78a93270b0ebbd19f9b98d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 12:03:16 +0900 Subject: [PATCH 1/6] update RootlessKit (2.0.0) Signed-off-by: Akihiro Suda (cherry picked from commit 328497a8079dca35a22ebf8f007045ebe6a99791) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 11 ++++++++++- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.0 | 6 ++++++ 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2e6ac21683b..0dfcaa6377f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -158,31 +158,40 @@ jobs: include: - ubuntu: 20.04 containerd: v1.6.26 + rootlesskit: v1.1.1 target: test-integration-rootless - ubuntu: 20.04 containerd: v1.7.11 + rootlesskit: v2.0.0 target: test-integration-rootless - ubuntu: 22.04 containerd: v1.7.11 + rootlesskit: v1.1.1 target: test-integration-rootless - ubuntu: 22.04 containerd: main + rootlesskit: v2.0.0 target: test-integration-rootless - ubuntu: 20.04 containerd: v1.6.26 + rootlesskit: v1.1.1 target: test-integration-rootless-port-slirp4netns - ubuntu: 20.04 containerd: v1.7.11 + rootlesskit: v2.0.0 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 containerd: v1.7.11 + rootlesskit: v1.1.1 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 containerd: main + rootlesskit: v2.0.0 target: test-integration-rootless-port-slirp4netns env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" CONTAINERD_VERSION: "${{ matrix.containerd }}" + ROOTLESSKIT_VERSION: "${{ matrix.rootlesskit }}" TEST_TARGET: "${{ matrix.target }}" steps: - uses: actions/checkout@v4.1.1 @@ -191,7 +200,7 @@ jobs: - name: "Register QEMU (tonistiigi/binfmt)" run: docker run --privileged --rm tonistiigi/binfmt --install all - name: "Prepare (network driver=slirp4netns, port driver=builtin)" - run: DOCKER_BUILDKIT=1 docker build -t ${TEST_TARGET} --target ${TEST_TARGET} --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} . + run: DOCKER_BUILDKIT=1 docker build -t ${TEST_TARGET} --target ${TEST_TARGET} --build-arg UBUNTU_VERSION=${UBUNTU_VERSION} --build-arg CONTAINERD_VERSION=${CONTAINERD_VERSION} --build-arg ROOTLESSKIT_VERSION=${ROOTLESSKIT_VERSION} . - name: "Test (network driver=slirp4netns, port driver=builtin)" run: docker run -t --rm --privileged -e WORKAROUND_ISSUE_622=1 ${TEST_TARGET} diff --git a/Dockerfile b/Dockerfile index c36a5ac26f5..2688ae565f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption ARG IMGCRYPT_VERSION=v1.1.9 # Extra deps: Rootless -ARG ROOTLESSKIT_VERSION=v1.1.1 +ARG ROOTLESSKIT_VERSION=v2.0.0 ARG SLIRP4NETNS_VERSION=v1.2.2 # Extra deps: bypass4netns ARG BYPASS4NETNS_VERSION=v0.3.0 diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.0 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.0 new file mode 100644 index 00000000000..933f7fc1276 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.0.0 @@ -0,0 +1,6 @@ +c24c13b0a7d74ea2ce9c44ca13810844149c93b5d193a08bf21166d08706621c rootlesskit-aarch64.tar.gz +da79e531f38688aad050c93e0c4d2b1f33e888e9dc6301f9866eabfec93bc75f rootlesskit-armv7l.tar.gz +181e9ff0c9ee0286b7b5384893b5dc6498098eee7014de253f053e3b50fdcbdb rootlesskit-ppc64le.tar.gz +709527301c6c4046cbe0ef5043a866ca7cfd105d91dee4a49ef3c85c8e57de5a rootlesskit-riscv64.tar.gz +28a8d3eb8eb6fc49cba4819a3a74be6319e7060707e37ca02425107ed65c034e rootlesskit-s390x.tar.gz +8205e3f96ca9eb576a0b182455fb5ad1067bf019a7fe50a1816f6c04b581723f rootlesskit-x86_64.tar.gz From d23907d615dbc9040140d106d90d22ddaee7e6b1 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:13:58 +0900 Subject: [PATCH 2/6] update containerd (1.7.13) Signed-off-by: Akihiro Suda (cherry picked from commit 3ab02f69554537a997dbf2c2e8515bdd3c7899b3) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 24 ++++++++++++------------ Dockerfile | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0dfcaa6377f..71faf57aee1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -77,11 +77,11 @@ jobs: # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2 include: - ubuntu: 20.04 - containerd: v1.6.26 + containerd: v1.6.28 - ubuntu: 20.04 - containerd: v1.7.11 + containerd: v1.7.13 - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 - ubuntu: 22.04 containerd: main env: @@ -113,7 +113,7 @@ jobs: # ubuntu-20.04: cgroup v1, ubuntu-22.04: cgroup v2 include: - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" CONTAINERD_VERSION: "${{ matrix.containerd }}" @@ -157,15 +157,15 @@ jobs: # ubuntu-22.04: cgroup v1, ubuntu-22.04: cgroup v2 include: - ubuntu: 20.04 - containerd: v1.6.26 + containerd: v1.6.28 rootlesskit: v1.1.1 target: test-integration-rootless - ubuntu: 20.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v2.0.0 target: test-integration-rootless - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v1.1.1 target: test-integration-rootless - ubuntu: 22.04 @@ -173,15 +173,15 @@ jobs: rootlesskit: v2.0.0 target: test-integration-rootless - ubuntu: 20.04 - containerd: v1.6.26 + containerd: v1.6.28 rootlesskit: v1.1.1 target: test-integration-rootless-port-slirp4netns - ubuntu: 20.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v2.0.0 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 - containerd: v1.7.11 + containerd: v1.7.13 rootlesskit: v1.1.1 target: test-integration-rootless-port-slirp4netns - ubuntu: 22.04 @@ -276,7 +276,7 @@ jobs: - uses: actions/checkout@v4.1.1 with: repository: containerd/containerd - ref: v1.7.11 + ref: v1.7.13 path: containerd fetch-depth: 1 - name: "Set up CNI" @@ -284,7 +284,7 @@ jobs: run: GOPATH=$(go env GOPATH) script/setup/install-cni-windows - name: "Set up containerd" env: - ctrdVersion: 1.7.11 + ctrdVersion: 1.7.13 run: powershell hack/configure-windows-ci.ps1 # TODO: Run unit tests - name: "Run integration tests" diff --git a/Dockerfile b/Dockerfile index 2688ae565f5..b2443dad4dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ # TODO: verify commit hash # Basic deps -ARG CONTAINERD_VERSION=v1.7.11 +ARG CONTAINERD_VERSION=v1.7.13 ARG RUNC_VERSION=v1.1.11 ARG CNI_PLUGINS_VERSION=v1.4.0 From a5582d516ca17bdb70ede0f6b655e34e3df59a2d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:14:32 +0900 Subject: [PATCH 3/6] update runc (1.1.12) Signed-off-by: Akihiro Suda (cherry picked from commit 02dc9b44cf7d20b0ec1191072948e3bb0d8d0e92) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2443dad4dd..a3f1ea22b50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ # Basic deps ARG CONTAINERD_VERSION=v1.7.13 -ARG RUNC_VERSION=v1.1.11 +ARG RUNC_VERSION=v1.1.12 ARG CNI_PLUGINS_VERSION=v1.4.0 # Extra deps: Build From fa1e6303667bab0a191d35d2233933a59d4a3b6a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:15:34 +0900 Subject: [PATCH 4/6] update bypass4netns (0.4.0) Signed-off-by: Akihiro Suda (cherry picked from commit ad02e192db74d06c44cc3b3c9c8e049f401abc02) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a3f1ea22b50..ac8f4251fb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ ARG IMGCRYPT_VERSION=v1.1.9 ARG ROOTLESSKIT_VERSION=v2.0.0 ARG SLIRP4NETNS_VERSION=v1.2.2 # Extra deps: bypass4netns -ARG BYPASS4NETNS_VERSION=v0.3.0 +ARG BYPASS4NETNS_VERSION=v0.4.0 # Extra deps: FUSE-OverlayFS ARG FUSE_OVERLAYFS_VERSION=v1.13 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8 From 0926e62ddf0c336cb10f4cfce74104b74033d6bd Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:16:54 +0900 Subject: [PATCH 5/6] update Kubo (0.26.0) Signed-off-by: Akihiro Suda (cherry picked from commit dc7bbed8667d49d559021117af5f1d20a61d7fef) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac8f4251fb0..3c65a3c0428 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ ARG BYPASS4NETNS_VERSION=v0.4.0 ARG FUSE_OVERLAYFS_VERSION=v1.13 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.8 # Extra deps: IPFS -ARG KUBO_VERSION=v0.24.0 +ARG KUBO_VERSION=v0.26.0 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug From 0e57452202028d76f2856f160bdf0fe8f5760816 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 31 Jan 2024 16:24:04 +0900 Subject: [PATCH 6/6] update BuildKit (0.12.5) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.4 | 2 -- Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.5 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.4 create mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.5 diff --git a/Dockerfile b/Dockerfile index 3c65a3c0428..c90cdb69f77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.12 ARG CNI_PLUGINS_VERSION=v1.4.0 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.12.4 +ARG BUILDKIT_VERSION=v0.12.5 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.4 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.4 deleted file mode 100644 index ff290731061..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.4 +++ /dev/null @@ -1,2 +0,0 @@ -75ffe406e4284b77af35447d829767cfa935eb7dd2ea2e3407223d6885bd8ebd buildkit-v0.12.4.linux-amd64.tar.gz -9166eeaff11721122b9398d6385c7b73d6e4df86797e537c16ac6b6d05eab899 buildkit-v0.12.4.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.5 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.5 new file mode 100644 index 00000000000..298faf7fa92 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.12.5 @@ -0,0 +1,2 @@ +fcd9149b876fba0404365cb021937e2435cad443d2a31b2bc5360298f900dfd7 buildkit-v0.12.5.linux-amd64.tar.gz +45624b083f88c1b0160aebe9f9589c723900b248ec36bda46b97af2698bbfd1d buildkit-v0.12.5.linux-arm64.tar.gz