Use host docker in jenkins container (#74)

cegeka · Dec 30, 2015 · 8264099 · 8264099
1 parent 6fcd5db
commit 8264099
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/ops/jenkins/Dockerfile b/ops/jenkins/Dockerfile
@@ -2,19 +2,22 @@ FROM jenkins:1.625.3
 
 USER root
 
+# Instal jdk8
 RUN echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \
 		echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \
 		echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections && \
 		apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886 && \
 		apt-get update && \
 		apt-get install -y oracle-java8-installer
 
+# Install mvn 3.3.9
 RUN curl -s http://apache.belnet.be/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz > /tmp/apache-maven-3.3.9-bin.tar.gz && \
 		tar xzvf /tmp/apache-maven-3.3.9-bin.tar.gz -C /tmp && \
 		mv /tmp/apache-maven-3.3.9 /opt && \
 		rm -r /tmp/apache-maven-3.3.9-bin.tar.gz
 
-USER jenkins
+# Use host docker
+RUN apt-get install -y lxc
 
 COPY config.groovy /usr/share/jenkins/ref/init.groovy.d/config.groovy
 

diff --git a/ops/jenkins/Jenkinsfile b/ops/jenkins/Jenkinsfile
@@ -1,5 +1,5 @@
 stage 'build'
-	node('linux && jdk8 && mvn3'){
+	node('linux && jdk8 && mvn3 && docker'){
 	    /* Tools */
 	    def javaHome = tool "jdk8"
 	    def mvnHome = tool "mvn3"
@@ -11,6 +11,7 @@ stage 'build'
 		dir("dws"){
     		withEnv(["JAVA_HOME=${javaHome}", "PATH+MAVEN=${mvnHome}/bin"]) {
     		    sh "mvn --version"
+    		    sh "docker info"
     		}
 		}
 	}
diff --git a/ops/jenkins/config.groovy b/ops/jenkins/config.groovy
@@ -3,7 +3,7 @@ import hudson.tasks.*
 
 def jenkins = Jenkins.instance;
 jenkins.setNumExecutors(5);
-jenkins.setLabelString("linux jdk8 mvn3");
+jenkins.setLabelString("linux jdk8 mvn3 docker");
 
 def jdk8 = new hudson.model.JDK("jdk8", "/usr/lib/jvm/java-8-oracle");
 jenkins.setJDKs([jdk8]);

diff --git a/ops/scripts/start-jenkins.sh b/ops/scripts/start-jenkins.sh
@@ -10,4 +10,8 @@ fi
 
 docker build -t dws_jenkins ../jenkins/
 docker rm -f dws_jenkins
-docker run -d -p 8888:8080 -v $JENKINS_HOME:/var/jenkins_home  --name dws_jenkins dws_jenkins
+docker run -d -p 8888:8080 \
+		   -v $JENKINS_HOME:/var/jenkins_home \
+		   -v /var/run/docker.sock:/var/run/docker.sock \
+		   -v $(which docker):/bin/docker \
+		   --name dws_jenkins dws_jenkins