From 5fa360d012537095d53818e2deaea011b9c6db23 Mon Sep 17 00:00:00 2001 From: Marc Villacorta Date: Tue, 7 Jun 2016 11:30:06 +0200 Subject: [PATCH] Update to Mesos 0.28.1 and Jenkins 2.8 --- Dockerfile | 12 +++++++----- README.md | 2 +- marathon.json | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3cc5be..6a2ddf5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,10 +9,10 @@ MAINTAINER Marc Villacorta Morera # Environment variables: #------------------------------------------------------------------------------ -ENV MESOS_VERSION="0.28.0" \ +ENV MESOS_VERSION="0.28.1" \ MESOS_URL="http://repos.mesosphere.io/el/7/noarch/RPMS" \ JENKINS_PLUGINS_URL="https://updates.jenkins-ci.org/download/plugins" \ - JENKINS_VERSION="2.6" \ + JENKINS_VERSION="2.8" \ JENKINS_MESOS_VERSION="0.12.0" #------------------------------------------------------------------------------ @@ -47,9 +47,11 @@ RUN rpm --import http://pkg.jenkins-ci.org/redhat/jenkins-ci.org.key \ #------------------------------------------------------------------------------ RUN mkdir -p /var/lib/jenkins/plugins && cd /var/lib/jenkins/plugins \ - && wget -q ${JENKINS_PLUGINS_URL}/mesos/${JENKINS_MESOS_VERSION}/mesos.hpi \ - && wget -q http://updates.jenkins-ci.org/latest/metrics.hpi \ - && wget -q http://updates.jenkins-ci.org/latest/credentials.hpi + && wget -q http://updates.jenkins-ci.org/download/plugins/credentials/2.0.7/credentials.hpi \ + && wget -q http://updates.jenkins-ci.org/download/plugins/junit/1.13/junit.hpi \ + && wget -q http://updates.jenkins-ci.org/download/plugins/jackson2-api/2.7.3/jackson2-api.hpi \ + && wget -q http://updates.jenkins-ci.org/download/plugins/metrics/3.1.2.7/metrics.hpi \ + && wget -q ${JENKINS_PLUGINS_URL}/mesos/${JENKINS_MESOS_VERSION}/mesos.hpi #------------------------------------------------------------------------------ # Populate root file system: diff --git a/README.md b/README.md index 749b111..ad2ea5f 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ docker run -it --rm \ --name jenkins \ --volume ${PWD}/jenkins_data:/var/lib/jenkins \ --publish 8080:8282 \ -h0tbird/jenkins:v2.3-1 +h0tbird/jenkins:v2.8-1 ``` ### Over provisioning flags diff --git a/marathon.json b/marathon.json index 395f737..9e0bb29 100644 --- a/marathon.json +++ b/marathon.json @@ -14,7 +14,7 @@ "container": { "type": "DOCKER", "docker": { - "image": "h0tbird/jenkins:v2.6-1", + "image": "h0tbird/jenkins:v2.8-1", "network": "BRIDGE", "portMappings": [ { "containerPort": 80, "hostPort": 0 }