From c08476b17a1c38de06b47082f88e87b95167319f Mon Sep 17 00:00:00 2001 From: ruowen Date: Thu, 3 May 2018 20:12:47 +0800 Subject: [PATCH] predownload tini and jenkins.war Change-Id: Ie03ef8b7646dedbc9cc010ccdcd05a56421d521f --- jenkins/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 24e5ac2..ad29d5e 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -60,8 +60,9 @@ ENV TINI_VERSION 0.14.0 ENV TINI_SHA 6c41ec7d33e857d4779f14d9c74924cab0c7973485d2972419a3b7c7620ff5fd # Use tini as subreaper in Docker container to adopt zombie processes -RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \ - && echo "$TINI_SHA /bin/tini" | sha256sum -c - +# RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \ +# && echo "$TINI_SHA /bin/tini" | sha256sum -c - +COPY bin/tini /bin/tini COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy @@ -77,8 +78,9 @@ ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-w # could use ADD but this one does not check Last-Modified header neither does it allow to control checksum # see https://github.com/docker/docker/issues/8331 -RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \ - && echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c - +# RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \ +# && echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c - +COPY jenkins-war-2.107.2.war /usr/share/jenkins/jenkins.war ENV JENKINS_UC https://updates.jenkins.io ENV JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental -- GitLab