From 553ee688742c54169a25e6c091da3e06f9fe81df Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 18 Aug 2024 01:50:57 +0900 Subject: [PATCH 1/7] update golangci-lint (1.60.1) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b4c372c3b29..a1b2439ccbc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -28,7 +28,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v6.1.0 with: - version: v1.59.1 + version: v1.60.1 args: --verbose - name: yamllint-lint run: make lint-yaml From ddcf41c2c992e84ae300765d6a3f8879b43692ce Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 18 Aug 2024 01:50:03 +0900 Subject: [PATCH 2/7] update Debian (12) Signed-off-by: Akihiro Suda --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43bedeaeb64..2c42e2a6fc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,12 +54,11 @@ ARG SOCI_SNAPSHOTTER_VERSION=0.6.1 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx -FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-debian +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bookworm AS build-base-debian COPY --from=xx / / ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq && apt-get install -qq --no-install-recommends \ git \ - pkg-config \ dpkg-dev ARG TARGETARCH # libbtrfs: for containerd @@ -69,7 +68,8 @@ RUN xx-apt-get update -qq && xx-apt-get install -qq --no-install-recommends \ gcc \ libc6-dev \ libbtrfs-dev \ - libseccomp-dev + libseccomp-dev \ + pkg-config FROM build-base-debian AS build-containerd ARG TARGETARCH From 9efda2271debe5f9f06933ee327aea32edeeb56d Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 18 Aug 2024 01:43:44 +0900 Subject: [PATCH 3/7] update Go (1.23) Signed-off-by: Akihiro Suda --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 4 ++-- Dockerfile | 2 +- hack/build-integration-kube.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a26668f6338..d46f8827757 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v4.1.7 - uses: actions/setup-go@v5 with: - go-version: 1.22.x + go-version: 1.23.x - name: "Compile binaries" run: make artifacts - name: "SHA256SUMS" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a1b2439ccbc..e9b3b9792a1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ on: - '**.md' env: - GO_VERSION: 1.22.x + GO_VERSION: 1.23.x jobs: lint: @@ -236,7 +236,7 @@ jobs: timeout-minutes: 40 strategy: matrix: - go-version: ["1.21.x", "1.22.x"] + go-version: ["1.22.x", "1.23.x"] steps: - uses: actions/checkout@v4.1.7 with: diff --git a/Dockerfile b/Dockerfile index 2c42e2a6fc6..e5d07e81d67 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ ARG TINI_VERSION=v0.19.0 ARG BUILDG_VERSION=v0.4.1 # Test deps -ARG GO_VERSION=1.22 +ARG GO_VERSION=1.23 ARG UBUNTU_VERSION=24.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 ARG GOTESTSUM_VERSION=v1.12.0 diff --git a/hack/build-integration-kube.sh b/hack/build-integration-kube.sh index 0f867530e2c..52ae61ca25a 100755 --- a/hack/build-integration-kube.sh +++ b/hack/build-integration-kube.sh @@ -21,7 +21,7 @@ readonly root # shellcheck source=/dev/null . "$root/scripts/lib.sh" -GO_VERSION=1.22 +GO_VERSION=1.23 KIND_VERSION=v0.23.0 [ "$(uname -m)" == "aarch64" ] && GOARCH=arm64 || GOARCH=amd64 From 6f7a56f2efd48a36592387a47a76564d937b9e25 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 18 Aug 2024 01:44:36 +0900 Subject: [PATCH 4/7] update kind (0.24.0) Signed-off-by: Akihiro Suda --- hack/build-integration-kube.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hack/build-integration-kube.sh b/hack/build-integration-kube.sh index 52ae61ca25a..0fa32457b21 100755 --- a/hack/build-integration-kube.sh +++ b/hack/build-integration-kube.sh @@ -22,7 +22,7 @@ readonly root . "$root/scripts/lib.sh" GO_VERSION=1.23 -KIND_VERSION=v0.23.0 +KIND_VERSION=v0.24.0 [ "$(uname -m)" == "aarch64" ] && GOARCH=arm64 || GOARCH=amd64 From 17a0749e8d2df02588dd8b960ac1d650c8170ba9 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 18 Aug 2024 01:46:36 +0900 Subject: [PATCH 5/7] update BuildKit (0.15.2) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.0 | 2 -- Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.2 | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.0 create mode 100644 Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.2 diff --git a/Dockerfile b/Dockerfile index e5d07e81d67..e790b0571b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG RUNC_VERSION=v1.1.13 ARG CNI_PLUGINS_VERSION=v1.5.1 # Extra deps: Build -ARG BUILDKIT_VERSION=v0.15.0 +ARG BUILDKIT_VERSION=v0.15.2 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.0 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.0 deleted file mode 100644 index bda954324e8..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.0 +++ /dev/null @@ -1,2 +0,0 @@ -803de21f1656b2f0398e09204abcff2943c17b6b5951fe5ccfc8300012fcb838 buildkit-v0.15.0.linux-amd64.tar.gz -dfa15ef3f194afc0f588de1e78053cdcd553e7de2f9692efe964c9aa7e9d621e buildkit-v0.15.0.linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.2 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.2 new file mode 100644 index 00000000000..a662a4e6cd1 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.15.2 @@ -0,0 +1,2 @@ +59279df5853bef19a03ec15c5c31b772e59d91d079ab0221e1bafa023cf41c35 buildkit-v0.15.2.linux-amd64.tar.gz +15329adaa5e5b2bea0580f3e5e33765f84504075710bb791e362c3b160ca7e61 buildkit-v0.15.2.linux-arm64.tar.gz From 3cb2cd1f50cf7d68273eb77384f4004952d31e91 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 18 Aug 2024 01:48:54 +0900 Subject: [PATCH 6/7] update soci-snapshotter (0.7.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e790b0571b7..67c12a66804 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,7 @@ ARG UBUNTU_VERSION=24.04 ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 ARG GOTESTSUM_VERSION=v1.12.0 ARG NYDUS_VERSION=v2.2.5 -ARG SOCI_SNAPSHOTTER_VERSION=0.6.1 +ARG SOCI_SNAPSHOTTER_VERSION=0.7.0 FROM --platform=$BUILDPLATFORM tonistiigi/xx:1.4.0 AS xx From 613f7c6ebd1758f6538187ce3a22aed0e6d71a5c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Sun, 18 Aug 2024 04:32:01 +0900 Subject: [PATCH 7/7] update RootlessKit (2.3.1) Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 6 +++--- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.1.0 | 6 ------ Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 | 6 ++++++ 4 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.1.0 create mode 100644 Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e9b3b9792a1..3743c44441c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -170,15 +170,15 @@ jobs: target: test-integration-rootless - ubuntu: 22.04 containerd: v1.7.19 - rootlesskit: v2.1.0 + rootlesskit: v2.3.1 target: test-integration-rootless - ubuntu: 24.04 containerd: v2.0.0-rc.3 - rootlesskit: v2.1.0 + rootlesskit: v2.3.1 target: test-integration-rootless - ubuntu: 24.04 containerd: v1.7.19 - rootlesskit: v2.1.0 + rootlesskit: v2.3.1 target: test-integration-rootless-port-slirp4netns env: UBUNTU_VERSION: "${{ matrix.ubuntu }}" diff --git a/Dockerfile b/Dockerfile index 67c12a66804..452b17a9f82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ ARG STARGZ_SNAPSHOTTER_VERSION=v0.15.1 # Extra deps: Encryption ARG IMGCRYPT_VERSION=v1.1.11 # Extra deps: Rootless -ARG ROOTLESSKIT_VERSION=v2.1.0 +ARG ROOTLESSKIT_VERSION=v2.3.1 ARG SLIRP4NETNS_VERSION=v1.3.1 # Extra deps: bypass4netns ARG BYPASS4NETNS_VERSION=v0.4.1 diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.1.0 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.1.0 deleted file mode 100644 index c60be289879..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.1.0 +++ /dev/null @@ -1,6 +0,0 @@ -b3a9b14b66f54351a2b9f8c0917062bfeab2dc89e9e7cb15f4cf0684a4a7281f rootlesskit-aarch64.tar.gz -6fd0be2aa10d7533e41f4013ee8f7e2779c16c6091a02d150d7998da16b6292a rootlesskit-armv7l.tar.gz -43c6fa763d61c3cb49216821009b1b7e6dcd5ba97a57ef8c2762a7ffbd317556 rootlesskit-ppc64le.tar.gz -914cdfb02a207a68b038a64871849dc0586242dd2cd3775de58e6a7c661f3c60 rootlesskit-riscv64.tar.gz -185c86ef5758ded11c685d725642f2bcb6fc27dbb450ed2fbd857347fb5d301b rootlesskit-s390x.tar.gz -1e4609a3d0ca67c4fc99fe9121870cf5ca46a438f43b151e9b54456d166f4b10 rootlesskit-x86_64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 new file mode 100644 index 00000000000..b624de1f641 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v2.3.1 @@ -0,0 +1,6 @@ +57bc67f71b8043961417325be13528d4f1e8ec90876cd34c38064431f457070f rootlesskit-aarch64.tar.gz +5154542509736957738478e3624b53865a875c396f978db5adea513d7507dee6 rootlesskit-armv7l.tar.gz +983642556dd3dcbe2c9b764d577882016ad1ca960815ffa13ca76d7da518504f rootlesskit-ppc64le.tar.gz +83c40bb8938828eb15837a4900ba825a1f52227631195c22df85f2e8f7f73546 rootlesskit-riscv64.tar.gz +dd6c8bc7e1c9b5d8c775efcf40854ef1d25205060294f0654a77d996a7f4e172 rootlesskit-s390x.tar.gz +caafdce18e0959f078b4b478d4f352ebf3d556e373265fc7831f1a6d70219ee0 rootlesskit-x86_64.tar.gz