From c3b621ddb714628c5928d3b078f5a7ecb409753d Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 10:26:26 +0300 Subject: [PATCH 1/8] test: keep vpnkit --- Dockerfile | 1 - service.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9a47697..4faab5f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,6 @@ RUN echo -en "https://dl-cdn.alpinelinux.org/alpine/v$(cut -d'.' -f1,2 /etc/alpi && apk add dpkg --no-cache \ # A security fix till it's fixed in base dind image (CR-31906) && apk add git --no-cache --upgrade \ - && rm /usr/local/bin/vpnkit \ && rm -rf /var/cache/apk/* # Backward compatibility with kernels that do not support `iptables-nft`. Check #CR-23033 for details. RUN update-alternatives --install $(which iptables) iptables $(which iptables-legacy) 10 \ diff --git a/service.yaml b/service.yaml index 99da8d1..babcf18 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 3.0.11 +version: 3.0.12 From 8f22eacf81f357c7d2eb15036ac3deabbf34a964 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 10:29:38 +0300 Subject: [PATCH 2/8] test: keep vpnkit From 825c367a62a1652242903aafef8f2e13ac72def2 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 10:30:45 +0300 Subject: [PATCH 3/8] test: keep vpnkit From 534322515fea6ee9522f5db8e32e44392082a276 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 10:32:31 +0300 Subject: [PATCH 4/8] test: keep vpnkit From fbf057eea2bc3cea7aa5b92342c44ed9c3c95420 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 10:34:42 +0300 Subject: [PATCH 5/8] test: keep vpnkit From 814b7a6294e5d8aaaae0f1b45466b4f50ffcb26c Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 10:47:16 +0300 Subject: [PATCH 6/8] test: keep vpnkit --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4faab5f..f3f811c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,4 +46,8 @@ RUN chown -R $(id -u rootless) /var/run RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl USER rootless RUN rm -i -f /var/run && ln -s /run/user/1000 /var/run + +RUN echo "1000:200000:65536" >> /etc/subuid +RUN echo "1000:200000:65536" >> /etc/subgid + ENTRYPOINT ["./run.sh"] From a4c4d2542c117fa2539472e3d837c5784381839d Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 10:51:06 +0300 Subject: [PATCH 7/8] test: keep vpnkit --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3f811c..f785117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,10 +44,11 @@ ADD . /dind RUN chown -R $(id -u rootless) /dind RUN chown -R $(id -u rootless) /var/run RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl -USER rootless -RUN rm -i -f /var/run && ln -s /run/user/1000 /var/run RUN echo "1000:200000:65536" >> /etc/subuid RUN echo "1000:200000:65536" >> /etc/subgid +USER rootless +RUN rm -i -f /var/run && ln -s /run/user/1000 /var/run + ENTRYPOINT ["./run.sh"] From 8e2f477dea037589ae9cc1e3bddd99d2e5dfcb08 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Thu, 19 Feb 2026 11:23:21 +0300 Subject: [PATCH 8/8] test: keep vpnkit --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f785117..8e8f37b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,10 +44,6 @@ ADD . /dind RUN chown -R $(id -u rootless) /dind RUN chown -R $(id -u rootless) /var/run RUN chown -R $(id -u rootless) /etc/ssl && chmod 777 -R /etc/ssl - -RUN echo "1000:200000:65536" >> /etc/subuid -RUN echo "1000:200000:65536" >> /etc/subgid - USER rootless RUN rm -i -f /var/run && ln -s /run/user/1000 /var/run