Merge branch 'master' into weekly
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..49a61f5
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,15 @@
+# Issues and Contributing
+
+Please note that only issues related to this Docker image will be addressed here.
+
+* If you have Docker related issues, please ask in the [Docker user mailing list](https://groups.google.com/forum/#!forum/docker-user).
+* If you have Jenkins related issues, please ask in the [Jenkins mailing lists](https://jenkins-ci.org/content/mailing-lists).
+* If you are not sure, then this is probably not the place to create an issue and you should use any of the previously mentioned mailing lists.
+
+If after going through the previous checklist you still think you should create an issue here please provide:
+
+* Docker commands that you execute
+* Actual result
+* Expected outcome
+* Output of `docker version`
+* Other relevant information
diff --git a/Dockerfile b/Dockerfile
index 8962d15..b3e2f96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,8 @@
# or config file with your custom jenkins Docker image.
RUN mkdir -p /usr/share/jenkins/ref/init.groovy.d
+# Use tini as subreaper in Docker container to adopt zombie processes
+RUN curl -fL https://github.com/krallin/tini/releases/download/v0.5.0/tini-static -o /bin/tini && chmod +x /bin/tini
COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groovy
@@ -44,7 +46,7 @@
USER jenkins
COPY jenkins.sh /usr/local/bin/jenkins.sh
-ENTRYPOINT ["/usr/local/bin/jenkins.sh"]
+ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
# from a derived Dockerfile, can use `RUN plugin.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle
COPY plugins.sh /usr/local/bin/plugins.sh
diff --git a/README.md b/README.md
index 0ded947..02c0f59 100644
--- a/README.md
+++ b/README.md
@@ -41,9 +41,11 @@
This is highly recommended. Treat the jenkins_home directory as you would a database - in Docker you would generally put a database on a volume.
-If your volume is inside a container - you can use ```docker cp $ID:/var/jenkins_home``` command to extract the data.
+If your volume is inside a container - you can use ```docker cp $ID:/var/jenkins_home``` command to extract the data, or other options to find where the volume data is.
Note that some symlinks on some OSes may be converted to copies (this can confuse jenkins with lastStableBuild links etc)
+For more info check Docker docs section on [Managing data in containers](https://docs.docker.com/userguide/dockervolumes/)
+
# Setting the number of executors
You can specify and set the number of executors of your Jenkins master instance using a groovy script. By default its set to 2 executors, but you can extend the image and change it to your desired number of executors :