commit 129a9700aa32e2c98a1fb8defee5b7eac409e8bc
author Nicolas De Loof <nicolas.deloof@gmail.com> Fri Jun 26 11:32:38 2015 +0200
committer Nicolas De Loof <nicolas.deloof@gmail.com> Fri Jun 26 11:32:38 2015 +0200
tree 50c0738dc17e2d37442cfff3a22f7ae907650bdc
parent 46c675c450b7bdeffeb1c48b435a00c1966480f3
parent aa188cfcf9c9b3613e08a2b298d0d685d2283d02

Merge branch 'master' into weekly

Dockerfile

diff --git a/Dockerfile b/Dockerfile
index d5b2da5..2b1fc9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,7 @@
 
 # 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