Merge pull request #2779 from AkihiroSuda/dev-1.7

[release/1.7] update RootlessKit (2.0.0), containerd (1.7.13), runc (1.1.12), bypass4netns (0.4.0), Kubo (0.26.0), BuildKit (0.12.5)

.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,32 +157,41 @@ 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
             containerd: main
+            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
             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/[email protected]
@@ -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}
 
@@ -267,15 +276,15 @@ jobs:
       - uses: actions/[email protected]
         with:
           repository: containerd/containerd
-          ref: v1.7.11
+          ref: v1.7.13
           path: containerd
           fetch-depth: 1
       - name: "Set up CNI"
         working-directory: containerd
         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"

Dockerfile

@@ -18,26 +18,26 @@
 # TODO: verify commit hash
 
 # Basic deps
-ARG CONTAINERD_VERSION=v1.7.11
-ARG RUNC_VERSION=v1.1.11
+ARG CONTAINERD_VERSION=v1.7.13
+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
 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
+ARG BYPASS4NETNS_VERSION=v0.4.0
 # Extra deps: FUSE-OverlayFS
 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

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

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