Browse Source

更新 'jenkins/Dockerfile'

main^2
凌文龙 3 years ago
parent
commit
1f5753c3a5
  1. 53
      jenkins/Dockerfile

53
jenkins/Dockerfile

@ -49,8 +49,6 @@ COPY docker-entrypoint.sh /usr/local/bin/
ENV DOCKER_TLS_CERTDIR=/certs
RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client
#ENTRYPOINT ["docker-entrypoint.sh"]
#CMD ["sh"]
RUN set -eux; \
apk add --no-cache \
@ -92,54 +90,3 @@ COPY dockerd-entrypoint.sh /usr/local/bin/
VOLUME /var/lib/docker
EXPOSE 2375 2376
#ENTRYPOINT ["dockerd-entrypoint.sh"]
#CMD []
#RUN apk add --no-cache iproute2
#
#RUN mkdir /run/user && chmod 1777 /run/user
#
#RUN set -eux; \
# echo 'jenkins:100000:65536' >> /etc/subuid; \
# echo 'jenkins:100000:65536' >> /etc/subgid
#
#RUN set -eux; \
# \
# apkArch="$(apk --print-arch)"; \
# case "$apkArch" in \
# 'x86_64') \
# url='https://download.docker.com/linux/static/stable/x86_64/docker-rootless-extras-20.10.15.tgz'; \
# ;; \
# 'aarch64') \
# url='https://download.docker.com/linux/static/stable/aarch64/docker-rootless-extras-20.10.15.tgz'; \
# ;; \
# *) echo >&2 "error: unsupported architecture ($apkArch)"; exit 1 ;; \
# esac; \
# \
# wget -O rootless.tgz "$url"; \
# \
# tar --extract \
# --file rootless.tgz \
# --strip-components 1 \
# --directory /usr/local/bin/ \
# 'docker-rootless-extras/rootlesskit' \
# 'docker-rootless-extras/rootlesskit-docker-proxy' \
# 'docker-rootless-extras/vpnkit' \
# ; \
# rm rootless.tgz; \
# \
# rootlesskit --version; \
# vpnkit --version
#
## pre-create "/var/lib/docker" for our rootless user
#RUN set -eux; \
# mkdir -p /home/jenkins/.local/share/docker; \
# chown -R jenkins:jenkins /home/jenkins/.local/share/docker; \
# sed -i '40i\nohup dockerd-entrypoint.sh > nohup.out 2>&1 &' /usr/local/bin/jenkins-agent
#VOLUME /home/jenkins/.local/share/docker
#USER jenkins