commit a120b3816d29b3059725b2817181e4db1749c0b3
author Nicolas De Loof <nicolas.deloof@gmail.com> Thu Jul 02 13:31:13 2015 +0200
committer Nicolas De Loof <nicolas.deloof@gmail.com> Thu Jul 02 13:31:13 2015 +0200
tree 3864f6c01d3be6dee707f78501c7ef39cf8d49ce
parent eac1dbe8cf31af3edff8a85a9e41c3a8ddd067b3
parent ae8f8ed1bc623a85adc46343d320a7f9346d1882

Merge branch 'master' into weekly

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 4a24d0e..48f978a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,12 +21,12 @@
 
 COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy
 
-ENV JENKINS_VERSION 1.609.1
-ENV JENKINS_SHA 698284ad950bd663c783e99bc8045ca1c9f92159
+ENV JENKINS_VERSION 1.617
+ENV JENKINS_SHA ae33eb0c0c6ae2317812e11e76e31452a1ce0b62
 
 # could use ADD but this one does not check Last-Modified header 
 # see https://github.com/docker/docker/issues/8331
-RUN curl -fL http://mirrors.jenkins-ci.org/war-stable/$JENKINS_VERSION/jenkins.war -o /usr/share/jenkins/jenkins.war \
+RUN curl -fL http://mirrors.jenkins-ci.org/war/$JENKINS_VERSION/jenkins.war -o /usr/share/jenkins/jenkins.war \
   && echo "$JENKINS_SHA /usr/share/jenkins/jenkins.war" | sha1sum -c -
 
 ENV JENKINS_UC https://updates.jenkins-ci.org