From 6bec7086501f1ae8703aceeffd4afb338c4a8f69 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 9 Sep 2026 06:54:35 +0900 Subject: [PATCH 1/3] CI: update shadow (4.20.2) `--without-nscd` is dropped because of a regression in shadow 4.19 (shadow-maint/shadow issue 1733) Signed-off-by: Akihiro Suda --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ee5093f3..bbe86c68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG GO_VERSION=1.26 ARG UBUNTU_VERSION=24.04 -ARG SHADOW_VERSION=4.17.4 +ARG SHADOW_VERSION=4.20.2 ARG SLIRP4NETNS_VERSION=v1.3.4 ARG VPNKIT_VERSION=0.6.0 ARG PASST_VERSION=2026_07_28.f8df3f1 @@ -44,7 +44,7 @@ RUN git clone https://github.com/shadow-maint/shadow.git /shadow WORKDIR /shadow ARG SHADOW_VERSION RUN git pull && git checkout $SHADOW_VERSION -RUN ./autogen.sh --disable-nls --disable-man --without-audit --without-selinux --without-acl --without-attr --without-tcb --without-nscd && \ +RUN ./autogen.sh --disable-nls --disable-man --without-audit --without-selinux --without-acl --without-attr --without-tcb && \ make && \ cp src/newuidmap src/newgidmap /usr/bin From 3b7e291830eaa3cee7e6ee497d4ea56db4b41a4c Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 9 Sep 2026 07:23:20 +0900 Subject: [PATCH 2/3] CI: update slirp4netns (1.3.5) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bbe86c68..264dffca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG GO_VERSION=1.26 ARG UBUNTU_VERSION=24.04 ARG SHADOW_VERSION=4.20.2 -ARG SLIRP4NETNS_VERSION=v1.3.4 +ARG SLIRP4NETNS_VERSION=v1.3.5 ARG VPNKIT_VERSION=0.6.0 ARG PASST_VERSION=2026_07_28.f8df3f1 ARG DOCKER_VERSION=29.5.2 From 00138c7b9f31185f8d9324cd6292558449396c87 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Wed, 9 Sep 2026 07:24:48 +0900 Subject: [PATCH 3/3] CI: update Docker (29.8.0) Signed-off-by: Akihiro Suda --- .github/workflows/main.yaml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 38f26c30..1a49d45e 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -273,7 +273,7 @@ jobs: # rootlesskit-docker-proxy is no longer used since Docker v28. # # The design of netns handling was changed in Docker v29.5. - docker_version: [27.5.1, 29.4.3, 29.5.2] + docker_version: [27.5.1, 29.4.3, 29.8.0] steps: - name: "Set up AppArmor" run: | diff --git a/Dockerfile b/Dockerfile index 264dffca..511f3d90 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG SHADOW_VERSION=4.20.2 ARG SLIRP4NETNS_VERSION=v1.3.5 ARG VPNKIT_VERSION=0.6.0 ARG PASST_VERSION=2026_07_28.f8df3f1 -ARG DOCKER_VERSION=29.5.2 +ARG DOCKER_VERSION=29.8.0 ARG DOCKER_CHANNEL=stable FROM golang:${GO_VERSION}-alpine AS build