Merge pull request #70 from jglick/demo-updates

Demo tweaks

Author: jglick

demo/Dockerfile

@@ -22,19 +22,10 @@
 # THE SOFTWARE.
 ##
 
-FROM jenkinsci/workflow-demo:2.3
+FROM jenkinsci/workflow-demo:2.4
 
 USER root
 
-RUN apt-get update
-RUN apt-get install -y sudo
-RUN adduser jenkins sudo
-RUN echo 'Defaults !authenticate' >> /etc/sudoers
-
-# Minimum for docker-workflow. Docker server does not accept a client newer than itself (older is OK).
-RUN wget -O /usr/bin/docker --no-check-certificate https://get.docker.com/builds/Linux/x86_64/docker-1.4.0
-RUN chmod a+x /usr/bin/docker
-
 ADD repo /tmp/repo
 RUN git config --global user.email "[email protected]" && git config --global user.name "Docker Workflow Demo" && cd /tmp/repo && git init && git add . && git commit -m 'demo'
 
@@ -49,5 +40,6 @@ RUN /usr/local/bin/plugins.sh /tmp/files/plugins.txt
 ADD JENKINS_HOME /usr/share/jenkins/ref
 
 COPY run-demo.sh /usr/local/bin/run-demo.sh
+ENV JAVA_OPTS -Djenkins.install.state=INITIAL_SECURITY_SETUP
 
 CMD /usr/local/bin/run-demo.sh

demo/Makefile

@@ -46,7 +46,7 @@ build-snapshot:	build-proxy
 #	
 # If using boot2docker, you need to tell your remote debugger to use the boot2docker VM ip (ala boot2docker ip).
 
-DOCKER_RUN=docker run --rm -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock
+DOCKER_RUN=docker run --rm -p 127.0.0.1:8080:8080 -v $(shell which docker):/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock --group-add=$(shell stat -c %g /var/run/docker.sock)
 
 run:	build
 	$(DOCKER_RUN) $(IMAGE):$(TAG)

demo/README.md

@@ -4,7 +4,7 @@ This image contains a "Docker Pipeline" Job that demonstrates Jenkins Pipeline i
 with Docker via [CloudBees Docker Pipeline](https://wiki.jenkins-ci.org/display/JENKINS/CloudBees+Docker+Pipeline+Plugin) plugin.
 
 ```
-docker run --rm -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock jenkinsci/docker-workflow-demo
+docker run --rm -p 127.0.0.1:8080:8080 -v $(which docker):/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock --group-add=$(stat -c %g /var/run/docker.sock) jenkinsci/docker-workflow-demo
 ```
 
 The "Docker Pipeline" Job simply does the following:

demo/plugins.txt

@@ -2,4 +2,5 @@ docker-workflow:1.8
 docker-commons:1.4.0
 authentication-tokens:1.3
 credentials:2.1.4
+icon-shim:2.0.3
 xvnc:1.24

demo/run-demo.sh

@@ -24,8 +24,6 @@
 # THE SOFTWARE.
 ##
 
-sudo chmod a+rw /var/run/docker.sock
-
 #
 # Install a private registry that can be used by the demo to push images to.
 #