Skip to content

Commit dc28e5d

Browse files
committed
Dockerfile: update test deps
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
1 parent a313ce8 commit dc28e5d

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ jobs:
225225
matrix:
226226
# The design of the proxy was changed in Docker v28.
227227
# rootlesskit-docker-proxy is no longer used since Docker v28.
228-
docker_version: [27.5.1, 28.1.1]
228+
docker_version: [27.5.1, 29.3.0]
229229
steps:
230230
- name: "Set up AppArmor"
231231
run: |

Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
ARG GO_VERSION=1.24
1+
ARG GO_VERSION=1.25
22
ARG UBUNTU_VERSION=24.04
33
ARG SHADOW_VERSION=4.17.4
4-
ARG SLIRP4NETNS_VERSION=v1.3.2
4+
ARG SLIRP4NETNS_VERSION=v1.3.3
55
ARG VPNKIT_VERSION=0.6.0
6-
ARG PASST_VERSION=2025_04_15.2340bbf
7-
ARG DOCKER_VERSION=28.1.1
6+
ARG PASST_VERSION=2026_01_20.386b5f5
7+
ARG DOCKER_VERSION=29.3.0
88
ARG DOCKER_CHANNEL=stable
99

1010
FROM golang:${GO_VERSION}-alpine AS build
@@ -95,8 +95,7 @@ FROM test-integration AS test-integration-docker
9595
ARG DOCKER_VERSION
9696
ARG DOCKER_CHANNEL
9797
RUN curl -fsSL https://download.docker.com/linux/static/${DOCKER_CHANNEL}/$(uname -m)/docker-${DOCKER_VERSION}.tgz | tar xz --strip-components=1 -C /home/user/bin/
98-
RUN curl -fsSL -o /home/user/bin/dockerd-rootless.sh https://raw.githubusercontent.com/moby/moby/v${DOCKER_VERSION}/contrib/dockerd-rootless.sh && \
99-
chmod +x /home/user/bin/dockerd-rootless.sh
98+
RUN curl -fsSL https://download.docker.com/linux/static/${DOCKER_CHANNEL}/$(uname -m)/docker-rootless-extras-${DOCKER_VERSION}.tgz | tar xz --strip-components=1 -C /home/user/bin/ docker-rootless-extras/dockerd-rootless.sh
10099
# rootlesskit-docker-proxy is no longer needed since Docker v28
101100
RUN --mount=source=/rootlesskit-docker-proxy,target=/tmp/rootlesskit-docker-proxy,from=artifact <<EOT
102101
set -ex

0 commit comments

Comments
 (0)