From f15bc8e6b723c36403e9b45a3a53419f4291e8be Mon Sep 17 00:00:00 2001 From: zuohuadong Date: Thu, 12 Oct 2017 18:37:26 +0800 Subject: [PATCH] update jenkins version update jenkins version to 2.73.2 update docker-compose version to 1.16.1 update TINI version to 0.16.1 --- jenkins/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile index 63480c7c..cfcba23f 100644 --- a/jenkins/Dockerfile +++ b/jenkins/Dockerfile @@ -25,8 +25,8 @@ VOLUME /var/jenkins_home # or config file with your custom jenkins Docker image. RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d -ENV TINI_VERSION 0.13.2 -ENV TINI_SHA afbf8de8a63ce8e4f18cb3f34dfdbbd354af68a1 +ENV TINI_VERSION 0.16.1 +ENV TINI_SHA d1cb5d71adc01d47e302ea439d70c79bd0864288 # 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 \ @@ -36,10 +36,10 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION ${JENKINS_VERSION:-2.32.3} +ENV JENKINS_VERSION ${JENKINS_VERSION:-2.73.2} # jenkins.war checksum, download will be validated using it -ARG JENKINS_SHA=a25b9a314ca9e76f9673da7309e1882e32674223 +ARG JENKINS_SHA=f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3 # Can be used to customize where jenkins.war get downloaded from ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war @@ -47,7 +47,7 @@ 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" | sha1sum -c - + && echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c - ENV JENKINS_UC https://updates.jenkins.io RUN chown -R ${user} "$JENKINS_HOME" /usr/share/jenkins/ref @@ -71,7 +71,7 @@ RUN apt-get install -y curl && curl -sSL https://get.docker.com/ | sh RUN usermod -aG docker jenkins # Install Docker-Compose -RUN curl -L "https://github.com/docker/compose/releases/download/1.10.0/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose +RUN curl -L "https://github.com/docker/compose/releases/download/1.16.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose RUN chmod +x /usr/local/bin/docker-compose