commit 53bb39dc62f2d8a9f7fcc94f2b0554685d7f0df2
author Carlos Sanchez <carlos@apache.org> Mon Jun 20 14:31:48 2016 +0200
committer GitHub <noreply@github.com> Mon Jun 20 14:31:48 2016 +0200
tree 397eee95832b801877d918906b838778026186a6
parent e25c5e283b37a89bc8c7f772aaf7f31e0b6d996b
parent e550fba0fdd02b6d00f34fd9842295ed957891b2

Merge pull request #287 from jgmchan/patch-1

Do not error if there are no 'resolved' flag files

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 3617254..cd18919 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,18 +25,19 @@
 # or config file with your custom jenkins Docker image.
 RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d
 
-ENV TINI_SHA 066ad710107dc7ee05d3aa6e4974f01dc98f3888
+ENV TINI_VERSION 0.9.0
+ENV TINI_SHA fa23d1e20732501c3bb8eeeca423c89ac80ed452
 
 # Use tini as subreaper in Docker container to adopt zombie processes 
-RUN curl -fsSL https://github.com/krallin/tini/releases/download/v0.5.0/tini-static -o /bin/tini && chmod +x /bin/tini \
+RUN curl -fsSL https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-static -o /bin/tini && chmod +x /bin/tini \
   && echo "$TINI_SHA  /bin/tini" | sha1sum -c -
 
 COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy
 
 ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-1.651.2}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-1.651.3}
 ARG JENKINS_SHA
-ENV JENKINS_SHA ${JENKINS_SHA:-f61b8b604acba5076a93dcde28c0be2561d17bde}
+ENV JENKINS_SHA ${JENKINS_SHA:-564e49fbd180d077a22a8c7bb5b8d4d58d2a18ce}
 
 
 # could use ADD but this one does not check Last-Modified header 

weekly.sh

diff --git a/weekly.sh b/weekly.sh
index e615272..d70452d 100755
--- a/weekly.sh
+++ b/weekly.sh
@@ -11,6 +11,7 @@
 
 docker build --build-arg JENKINS_VERSION=$JENKINS_VERSION \
              --build-arg JENKINS_SHA=$JENKINS_SHA \
+             --no-cache --pull \
              --tag jenkinsci/jenkins:$JENKINS_VERSION .
 
 docker tag -f jenkinsci/jenkins:$JENKINS_VERSION jenkinsci/jenkins:latest