Tutorials 1-3 updated

tutorial_01/makefile

@@ -1,7 +1,7 @@
 build:
-	@docker pull jenkins:1.609.1
+	@docker pull jenkins/jenkins:2.112
 run:
-	@docker run -p 8080:8080 --name=jenkins-master -d --env JAVA_OPTS="-Xmx8192m" --env JENKINS_OPTS="--handlerCountStartup=100 --handlerCountMax=300" jenkins:1.609.1
+	@docker run -p 8080:8080 --name=jenkins-master -d --env JAVA_OPTS="-Xmx8192m" --env JENKINS_OPTS="--handlerCountMax=300" jenkins/jenkins:2.112
 start:
 	@docker start jenkins-master
 stop:

tutorial_02/Dockerfile

@@ -1,5 +1,5 @@
-FROM jenkins:1.609.1
-MAINTAINER Maxfield Stewart
+FROM jenkins/jenkins:2.112
+LABEL maintainer="[email protected]"
 
 # Create Jenkins Log Folder
 USER root
@@ -9,4 +9,4 @@ USER jenkins
 
 # Set default options
 ENV JAVA_OPTS="-Xmx8192m"
-ENV JENKINS_OPTS="--handlerCountStartup=100 --handlerCountMax=300 --logfile=/var/log/jenkins/jenkins.log"
+ENV JENKINS_OPTS="--handlerCountMax=300 --logfile=/var/log/jenkins/jenkins.log"

tutorial_03/jenkins-master/Dockerfile → tutorial_03/Dockerfile

@@ -1,5 +1,5 @@
-FROM jenkins:1.609.1
-MAINTAINER Maxfield Stewart
+FROM jenkins/jenkins:2.112
+LABEL maintainer="[email protected]"
 
 # Prep Jenkins Directories
 USER root
@@ -11,4 +11,4 @@ USER jenkins
 
 # Set Defaults
 ENV JAVA_OPTS="-Xmx8192m"
-ENV JENKINS_OPTS="--handlerCountStartup=100 --handlerCountMax=300 --logfile=/var/log/jenkins/jenkins.log  --webroot=/var/cache/jenkins/war"
+ENV JENKINS_OPTS="--handlerCountMax=300 --logfile=/var/log/jenkins/jenkins.log  --webroot=/var/cache/jenkins/war"

tutorial_03/makefile

@@ -1,13 +1,14 @@
 build:
-	@docker build -t myjenkins jenkins-master/.
-	@docker build -t myjenkinsdata jenkins-data/.
-run-data:
-	@docker run --name=jenkins-data myjenkinsdata
-run:
-	@docker run -p 8080:8080 -p 50000:50000 --name=jenkins-master --volumes-from=jenkins-data -d myjenkins
+	@docker build -t myjenkins .
+create-data:
+	@docker volume create jenkins-log
+	@docker volume create jenkins-data
+run: create-data
+	@docker run -p 8080:8080 -p 50000:50000 --name=jenkins-master --mount source=jenkins-log,target=/var/log/jenkins --mount source=jenkins-data,target=/var/jenkins_home -d myjenkins
 stop:
-	@docker stop jenkins-master
+	-docker stop jenkins-master
 clean:	stop
-	@docker rm jenkins-master
+	-docker rm jenkins-master
 clean-data:  clean
-	@docker rm -v jenkins-data
+	-docker volume rm jenkins-log
+	-docker volume rm jenkins-data