Skip to content

Commit 56b7fcd

Browse files
Merge pull request #41 from codefresh-io/slirp4netns-fix-dns-issue-rootless
Switch network driver to - Slirp4netns fix dns issue rootless
2 parents 61f5514 + 5a8bf16 commit 56b7fcd

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.DS_Store

6 KB
Binary file not shown.

Dockerfile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG DOCKER_VERSION=20.10.18
1+
ARG DOCKER_VERSION=20.10.24
22

33
# dind-cleaner
44
FROM golang:1.16-alpine3.15 AS cleaner
@@ -33,8 +33,12 @@ RUN chown -R $(id -u rootless) /var /run /lib /home /etc/ssl /etc/apk
3333
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 \
3434
&& apk upgrade \
3535
&& apk add bash jq fuse-overlayfs --no-cache \
36+
&& apk add slirp4netns --no-cache \
37+
&& rm /usr/local/bin/vpnkit \
3638
&& rm -rf /var/cache/apk/*
3739

40+
ENV DOCKERD_ROOTLESS_ROOTLESSKIT_NET=slirp4netns
41+
3842
COPY --from=node-exporter /bin/node_exporter /bin/
3943
COPY --from=cleaner /usr/local/bin/dind-cleaner /bin/
4044
COPY --from=bolter /go/bin/bolter /bin/

service.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version: 1.26.2
1+
version: 1.27.0

0 commit comments

Comments
 (0)