diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..989e618 Binary files /dev/null and b/.DS_Store differ diff --git a/Dockerfile b/Dockerfile index 3fd37a6..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 @@ -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/ diff --git a/service.yaml b/service.yaml index 0a50c09..97764a2 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.26.2 +version: 1.27.0