From 082cc1d2ed7004eb3a8c052c09254a4fafb8bda3 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Wed, 28 Jun 2023 09:52:47 +0300 Subject: [PATCH 1/5] switch to slirp4netns - fix dns issue on dind --- .DS_Store | Bin 0 -> 6148 bytes Dockerfile | 4 ++++ 2 files changed, 4 insertions(+) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..989e618204f27a06209ec22fe97811a7c3d1b90e GIT binary patch literal 6148 zcmeHK%}T>S5Z-NT(@=yQ6nb3nTCgoe5HF$D7cim+mDrf7!I&*gY7V84v%Zi|;`2DO zyEy~{-bCz7+5KkcXE*af_lGgYC#!JCn8O(BKttrH)CihuT@4eA$kiP8>>O`7 zp9PoEJolZwQ<-G5D48!+LKMy+uHB=cWmG3t=Hq>pfARw!KN?P z$0O8_#+!}Z**`cuIrpFAmqfm4A~|rbWY=H`@1Rs_di9n`ER#pDmpNrDAu&J<5Cg=( z_Ay}2f=+k)N~em60b<|>25^56&=6gNg+{e?K!?|7^tTXEK*zTPqA=(hEHr`#gzHp5 zoyyG)DvkMxvN`vvL{=Nc?D U;w)%a>40<*P=ruN4EzEEUppL2`v3p{ literal 0 HcmV?d00001 diff --git a/Dockerfile b/Dockerfile index 3fd37a6..faf8418 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,12 @@ RUN chown -R $(id -u rootless) /var /run /lib /home /etc/ssl /etc/apk RUN echo -en "https://dl-cdn.alpinelinux.org/alpine/v$(cut -d'.' -f1,2 /etc/alpine-release)/main\nhttps://dl-cdn.alpinelinux.org/alpine/v$(cut -d'.' -f1,2 /etc/alpine-release)/community" > /etc/apk/repositories \ && apk upgrade \ && apk add bash jq fuse-overlayfs --no-cache \ + && apk add slirp4netns --no-cache \ + && rm /usr/local/bin/vpnkit && \ && rm -rf /var/cache/apk/* +ENV DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns + COPY --from=node-exporter /bin/node_exporter /bin/ COPY --from=cleaner /usr/local/bin/dind-cleaner /bin/ COPY --from=bolter /go/bin/bolter /bin/ From 544904bbad9117a2b81f0f4929d809c2a9926342 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Wed, 28 Jun 2023 09:54:51 +0300 Subject: [PATCH 2/5] switch to slirp4netns - fix dns issue on dind --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index 0a50c09..ce81bf9 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.26.2 +version: 1.26.3 From ba458fe3c8300eb570c49a6ecbf225b1fc1f877d Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Wed, 28 Jun 2023 09:58:40 +0300 Subject: [PATCH 3/5] switch to slirp4netns - fix dns issue on dind --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index faf8418..4bd448a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ RUN echo -en "https://dl-cdn.alpinelinux.org/alpine/v$(cut -d'.' -f1,2 /etc/alpi && apk upgrade \ && apk add bash jq fuse-overlayfs --no-cache \ && apk add slirp4netns --no-cache \ - && rm /usr/local/bin/vpnkit && \ + && rm /usr/local/bin/vpnkit \ && rm -rf /var/cache/apk/* ENV DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns From a4a3200b60e1503e64044ec2732425df5d28b9b7 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Wed, 26 Jul 2023 14:23:11 +0300 Subject: [PATCH 4/5] bump docker version Signed-off-by: mikhail-klimko --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4bd448a..88c7a94 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG DOCKER_VERSION=20.10.18 +ARG DOCKER_VERSION=20.10.24 # dind-cleaner FROM golang:1.16-alpine3.15 AS cleaner From 5a8bf1610d129440a4f615d55414aaab6ef6ff99 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Wed, 26 Jul 2023 15:35:41 +0300 Subject: [PATCH 5/5] bump service.yaml Signed-off-by: mikhail-klimko --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index ce81bf9..97764a2 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.26.3 +version: 1.27.0