Skip to content

Commit

Permalink
A few changes:
Browse files Browse the repository at this point in the history
 - Update to Jenkins v2.19
 - Reduce CPU from 0.5 to 0.1
 - Mount host's /tmp into slave /tmp
  • Loading branch information
h0tbird committed Aug 25, 2016
1 parent 21ffd4d commit a267d01
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MAINTAINER Marc Villacorta Morera <[email protected]>
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.14" \
JENKINS_VERSION="2.19" \
JENKINS_MESOS_VERSION="0.13.0"

#------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ docker run -it --rm \
--name jenkins \
--volume ${PWD}/jenkins_data:/var/lib/jenkins \
--publish 8080:8282 \
katosys/jenkins:v2.14-2
katosys/jenkins:v2.19-1
```

### Over provisioning flags
Expand Down
4 changes: 2 additions & 2 deletions marathon.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"id": "/sys/jenkins",
"instances": 1,
"cpus": 0.5,
"cpus": 0.1,
"mem": 1024,
"disk": 0,
"requirePorts": false,
Expand All @@ -14,7 +14,7 @@
"container": {
"type": "DOCKER",
"docker": {
"image": "katosys/jenkins:v2.14-2",
"image": "katosys/jenkins:v2.19-1",
"network": "BRIDGE",
"portMappings": [
{ "containerPort": 80, "hostPort": 0 }
Expand Down
5 changes: 5 additions & 0 deletions rootfs/var/lib/jenkins/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
<hostPath>/var/run/docker.sock</hostPath>
<readOnly>false</readOnly>
</org.jenkinsci.plugins.mesos.MesosSlaveInfo_-Volume>
<org.jenkinsci.plugins.mesos.MesosSlaveInfo_-Volume>
<containerPath>/tmp</containerPath>
<hostPath>/tmp</hostPath>
<readOnly>false</readOnly>
</org.jenkinsci.plugins.mesos.MesosSlaveInfo_-Volume>
</volumes>
<parameters>
<org.jenkinsci.plugins.mesos.MesosSlaveInfo_-Parameter>
Expand Down

0 comments on commit a267d01

Please sign in to comment.