docker binary isn't installed in the jenkins-dsl-ready image anymore

binary just need to be mounted with a docker volume at run time
thomasleveil · Sep 7, 2015 · daa3ea1 · daa3ea1
1 parent 3ee0d0c
commit daa3ea1
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,13 +2,6 @@ FROM jenkins
 
 USER root
 
-# Install docker, so docker commands can be used in jobs
-ENV DOCKER_VERSION 1.8.1
-RUN curl -sSL https://get.docker.com/builds/Linux/x86_64/docker-$DOCKER_VERSION > /usr/bin/docker \
-	&& groupadd docker \
-	&& chmod 0755 /usr/bin/docker \
-	&& usermod -a -G docker jenkins
-
 # Install sudo to enpower jenkins (will be usefull for running docker in some cases)
 RUN apt-get update \
     && apt-get install -y sudo \

diff --git a/README.md b/README.md
@@ -107,6 +107,7 @@ Using the [dockerswarm/dind][dind] image, you can start a container which run an
 You would then start the jenkins-dsl-ready container with:
 
     docker run -d \
+        -v $(which docker):/usr/bin/docker:ro \
         -p 8080:8080 \
         --link dind:dind \
         -e DOCKER_HOST=tcp://dind:2375 \
@@ -130,6 +131,7 @@ In the end, the command to run such a container is:
     docker run -d \
         -u root \
         -v /var/run/docker.sock:/var/run/docker.sock \
+        -v $(which docker):/usr/bin/docker:ro \
         -p 8080:8080 \
         --name jenkins \
         tomdesinto/jenkins-dsl-ready
@@ -143,6 +145,7 @@ Same as method 2, but we don't run Jenkins as _root_. In this case the Jenkins j
 
     docker run -d \
         -v /var/run/docker.sock:/var/run/docker.sock \
+        -v $(which docker):/usr/bin/docker:ro \
         -p 8080:8080 \
         --name jenkins \
         tomdesinto/jenkins-dsl-ready

diff --git a/tests/SEEDJOB_GIT.bats b/tests/SEEDJOB_GIT.bats
@@ -6,7 +6,7 @@ GIT_CONTAINER=bats-git
 load test_helpers
 load jenkins_helpers
 
-@test "clean test containers" {
+@test "------ preparing $(basename $BATS_TEST_FILENAME .bats) ------" {
     docker kill $SUT_CONTAINER &>/dev/null ||:
     docker rm -fv $SUT_CONTAINER &>/dev/null ||:
     docker kill $GIT_CONTAINER &>/dev/null ||:

diff --git a/tests/SEEDJOB_SVN.bats b/tests/SEEDJOB_SVN.bats
@@ -6,7 +6,7 @@ SVN_CONTAINER=bats-svn
 load test_helpers
 load jenkins_helpers
 
-@test "clean test containers" {
+@test "------ preparing $(basename $BATS_TEST_FILENAME .bats) ------" {
     docker kill $SUT_CONTAINER &>/dev/null ||:
     docker rm -fv $SUT_CONTAINER &>/dev/null ||:
     docker kill $SVN_CONTAINER &>/dev/null ||:

diff --git a/tests/default.bats b/tests/default.bats
@@ -5,7 +5,7 @@ SUT_CONTAINER=bats-jenkins
 load test_helpers
 load jenkins_helpers
 
-@test "clean test containers" {
+@test "------ preparing $(basename $BATS_TEST_FILENAME .bats) ------" {
     docker kill $SUT_CONTAINER &>/dev/null ||:
     docker rm -fv $SUT_CONTAINER &>/dev/null ||:
 }

diff --git a/tests/job-using-dind.bats b/tests/job-using-dind.bats
@@ -6,7 +6,7 @@ DIND_CONTAINER=bats-dind
 load test_helpers
 load jenkins_helpers
 
-@test "clean test containers" {
+@test "------ preparing $(basename $BATS_TEST_FILENAME .bats) ------" {
     docker kill $SUT_CONTAINER &>/dev/null ||:
     docker rm -fv $SUT_CONTAINER &>/dev/null ||:
     docker kill $DIND_CONTAINER &>/dev/null ||:
@@ -27,13 +27,14 @@ load jenkins_helpers
 }
 
 @test "dind container is functionnal" {
-    docker exec $DIND_CONTAINER docker version
+    retry 3 1 docker exec $DIND_CONTAINER docker version
 }
 
 @test "SUT container with dind capabilities created" {
     docker run -d --name $SUT_CONTAINER \
         --link $DIND_CONTAINER:dind \
         -e DOCKER_HOST=tcp://dind:2375 \
+        -v $(which docker):/usr/bin/docker:ro \
         -v $BATS_TEST_DIRNAME/resources/dsl-job-using-docker/:/usr/share/jenkins/ref/jobs/SeedJob/workspace/:ro \
         -P \
         tomdesinto/jenkins-dsl-ready

diff --git a/tests/job-using-docker.bats b/tests/job-using-docker.bats
@@ -5,7 +5,7 @@ SUT_CONTAINER=bats-jenkins-docker
 load test_helpers
 load jenkins_helpers
 
-@test "clean test containers" {
+@test "------ preparing $(basename $BATS_TEST_FILENAME .bats) ------" {
     docker kill $SUT_CONTAINER &>/dev/null ||:
     docker rm -fv $SUT_CONTAINER &>/dev/null ||:
 }
@@ -15,6 +15,7 @@ load jenkins_helpers
         -v $BATS_TEST_DIRNAME/resources/dsl-job-using-docker/:/usr/share/jenkins/ref/jobs/SeedJob/workspace/:ro \
         -P \
         -v /var/run/docker.sock:/var/run/docker.sock \
+        -v $(which docker):/usr/bin/docker:ro \
         -u root \
         tomdesinto/jenkins-dsl-ready
 }

diff --git a/tests/job-using-sudo-docker.bats b/tests/job-using-sudo-docker.bats
@@ -5,7 +5,7 @@ SUT_CONTAINER=bats-jenkins-sudo-docker
 load test_helpers
 load jenkins_helpers
 
-@test "clean test containers" {
+@test "------ preparing $(basename $BATS_TEST_FILENAME .bats) ------" {
     docker kill $SUT_CONTAINER &>/dev/null ||:
     docker rm -fv $SUT_CONTAINER &>/dev/null ||:
 }
@@ -15,7 +15,7 @@ load jenkins_helpers
         -v $BATS_TEST_DIRNAME/resources/dsl-job-using-sudo-docker/:/usr/share/jenkins/ref/jobs/SeedJob/workspace/:ro \
         -P \
         -v /var/run/docker.sock:/var/run/docker.sock \
-        -u root \
+        -v $(which docker):/usr/bin/docker:ro \
         tomdesinto/jenkins-dsl-ready
 }