Skip to content

Commit fc3457c

Browse files
authored
Merge pull request #510 from AkihiroSuda/dev
Dockerfile: update test deps
2 parents 80d14d1 + 32e2a2a commit fc3457c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ jobs:
191191
matrix:
192192
# The design of the proxy was changed in Docker v28.
193193
# rootlesskit-docker-proxy is no longer used since Docker v28.
194-
docker_version: [27.5.1, 28.0.1]
194+
docker_version: [27.5.1, 28.1.1]
195195
steps:
196196
- name: "Set up AppArmor"
197197
run: |

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ARG GO_VERSION=1.24
22
ARG UBUNTU_VERSION=24.04
3-
ARG SHADOW_VERSION=4.16.0
3+
ARG SHADOW_VERSION=4.17.4
44
ARG SLIRP4NETNS_VERSION=v1.3.2
5-
ARG VPNKIT_VERSION=0.5.0
6-
ARG PASST_VERSION=2025_02_17.a1e48a0
7-
ARG DOCKER_VERSION=28.0.1
5+
ARG VPNKIT_VERSION=0.6.0
6+
ARG PASST_VERSION=2025_04_15.2340bbf
7+
ARG DOCKER_VERSION=28.1.1
88
ARG DOCKER_CHANNEL=stable
99

1010
FROM golang:${GO_VERSION}-alpine AS build
@@ -44,7 +44,7 @@ RUN ./autogen.sh --disable-nls --disable-man --without-audit --without-selinux -
4444
make && \
4545
cp src/newuidmap src/newgidmap /usr/bin
4646

47-
FROM djs55/vpnkit:${VPNKIT_VERSION} AS vpnkit
47+
FROM moby/vpnkit-bin:${VPNKIT_VERSION} AS vpnkit
4848

4949
FROM ubuntu:${UBUNTU_VERSION} AS passt
5050
ENV DEBIAN_FRONTEND=noninteractive

0 commit comments

Comments
 (0)