diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 0aca9d92..28c4f745 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -231,7 +231,9 @@ jobs: matrix: # The design of the proxy was changed in Docker v28. # rootlesskit-docker-proxy is no longer used since Docker v28. - docker_version: [27.5.1, 29.3.1] + # + # The design of netns handling was changed in Docker v29.5. + docker_version: [27.5.1, 29.4.3, 29.5.2] steps: - name: "Set up AppArmor" run: | diff --git a/Dockerfile b/Dockerfile index d586b216..100ba8a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ ARG GO_VERSION=1.25 ARG UBUNTU_VERSION=24.04 ARG SHADOW_VERSION=4.17.4 -ARG SLIRP4NETNS_VERSION=v1.3.3 +ARG SLIRP4NETNS_VERSION=v1.3.4 ARG VPNKIT_VERSION=0.6.0 ARG PASST_VERSION=2026_01_20.386b5f5 -ARG DOCKER_VERSION=29.3.1 +ARG DOCKER_VERSION=29.5.2 ARG DOCKER_CHANNEL=stable FROM golang:${GO_VERSION}-alpine AS build