Skip to content

Commit f9553df

Browse files
authored
Merge pull request laradock#1183 from zuohuadong/patch-11
update jenkins version
2 parents 903c774 + f15bc8e commit f9553df

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

jenkins/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ VOLUME /var/jenkins_home
2525
# or config file with your custom jenkins Docker image.
2626
RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d
2727

28-
ENV TINI_VERSION 0.13.2
29-
ENV TINI_SHA afbf8de8a63ce8e4f18cb3f34dfdbbd354af68a1
28+
ENV TINI_VERSION 0.16.1
29+
ENV TINI_SHA d1cb5d71adc01d47e302ea439d70c79bd0864288
3030

3131
# Use tini as subreaper in Docker container to adopt zombie processes
3232
RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static-amd64 -o /bin/tini && chmod +x /bin/tini \
@@ -36,18 +36,18 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov
3636

3737
# jenkins version being bundled in this docker image
3838
ARG JENKINS_VERSION
39-
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.32.3}
39+
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.73.2}
4040

4141
# jenkins.war checksum, download will be validated using it
42-
ARG JENKINS_SHA=a25b9a314ca9e76f9673da7309e1882e32674223
42+
ARG JENKINS_SHA=f6d1351beef34d980b32f8c463be505445f637e2fc62156fecd42891c53c97d3
4343

4444
# Can be used to customize where jenkins.war get downloaded from
4545
ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
4646

4747
# could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
4848
# see https://github.com/docker/docker/issues/8331
4949
RUN curl -fsSL ${JENKINS_URL} -o /usr/share/jenkins/jenkins.war \
50-
&& echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha1sum -c -
50+
&& echo "${JENKINS_SHA} /usr/share/jenkins/jenkins.war" | sha256sum -c -
5151

5252
ENV JENKINS_UC https://updates.jenkins.io
5353
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
7171
RUN usermod -aG docker jenkins
7272

7373
# Install Docker-Compose
74-
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
74+
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
7575
RUN chmod +x /usr/local/bin/docker-compose
7676

7777

0 commit comments

Comments
 (0)