From e4b3c2fd0b43c3b134cc541d9942cbb463533494 Mon Sep 17 00:00:00 2001 From: Docker Library Bot Date: Fri, 20 Nov 2015 13:01:30 -0800 Subject: [PATCH] Run update.sh --- aerospike/README.md | 2 +- alpine/README.md | 2 +- arangodb/README.md | 2 +- bonita/README.md | 2 +- buildpack-deps/README.md | 2 +- busybox/README.md | 2 +- cassandra/README.md | 2 +- celery/README.md | 2 +- centos/README.md | 2 +- cirros/README.md | 2 +- clojure/README.md | 2 +- couchbase/README.md | 2 +- crate/README.md | 2 +- crux/README.md | 2 +- debian/README.md | 2 +- django/README.md | 2 +- docker-dev/README.md | 2 +- docker/README.md | 2 +- drupal/README.md | 2 +- elasticsearch/README.md | 2 +- erlang/README.md | 2 +- fedora/README.md | 2 +- gazebo/README.md | 2 +- gcc/README.md | 2 +- ghost/README.md | 2 +- glassfish/README.md | 2 +- golang/README.md | 2 +- haproxy/README.md | 2 +- haskell/README.md | 2 +- hello-world/README.md | 2 +- hipache/README.md | 2 +- httpd/README.md | 2 +- hylang/README.md | 2 +- iojs/README.md | 2 +- irssi/README.md | 2 +- java/README.md | 2 +- jenkins/README.md | 143 +++++++++++++++++++++++++++++++---- jetty/README.md | 2 +- joomla/README.md | 2 +- jruby/README.md | 2 +- julia/README.md | 2 +- kaazing-gateway/README.md | 2 +- kibana/README.md | 2 +- logstash/README.md | 2 +- mageia/README.md | 2 +- mariadb/README.md | 2 +- maven/README.md | 2 +- memcached/README.md | 2 +- mongo/README.md | 2 +- mono/README.md | 2 +- mysql/README.md | 2 +- nats/README.md | 2 +- neo4j/README.md | 2 +- neurodebian/README.md | 2 +- nginx/README.md | 2 +- node/README.md | 2 +- odoo/README.md | 2 +- opensuse/README.md | 2 +- oraclelinux/README.md | 2 +- owncloud/README.md | 2 +- percona/README.md | 2 +- perl/README.md | 2 +- php-zendserver/README.md | 2 +- php/README.md | 2 +- postgres/README.md | 2 +- pypy/README.md | 2 +- python/README.md | 2 +- r-base/README.md | 2 +- rabbitmq/README.md | 2 +- rails/README.md | 2 +- rakudo-star/README.md | 2 +- redis/README.md | 2 +- redmine/README.md | 2 +- registry/README.md | 2 +- rethinkdb/README.md | 2 +- rocket.chat/README.md | 2 +- ros/README.md | 2 +- ruby/README.md | 2 +- sentry/README.md | 2 +- solr/README.md | 2 +- sonarqube/README.md | 2 +- sourcemage/README.md | 2 +- swarm/README.md | 2 +- thrift/README.md | 2 +- tomcat/README.md | 2 +- tomee/README.md | 2 +- ubuntu-debootstrap/README.md | 2 +- ubuntu-upstart/README.md | 2 +- ubuntu/README.md | 2 +- websphere-liberty/README.md | 2 +- wordpress/README.md | 2 +- 91 files changed, 218 insertions(+), 105 deletions(-) diff --git a/aerospike/README.md b/aerospike/README.md index c74e0657..4c31911d 100644 --- a/aerospike/README.md +++ b/aerospike/README.md @@ -93,7 +93,7 @@ Unless required by applicable law or agreed to in writing, software distributed # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/alpine/README.md b/alpine/README.md index a2fb2339..1e6c7c22 100644 --- a/alpine/README.md +++ b/alpine/README.md @@ -46,7 +46,7 @@ This image is well documented. [Check out the documentation at Viewdocs](http:// # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/arangodb/README.md b/arangodb/README.md index 20876c4c..b23c8581 100644 --- a/arangodb/README.md +++ b/arangodb/README.md @@ -144,7 +144,7 @@ $ docker run -d --name arangodb-persist -v /var/lib/arangodb alpine alpine # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/bonita/README.md b/bonita/README.md index c55189c5..5d629284 100644 --- a/bonita/README.md +++ b/bonita/README.md @@ -300,7 +300,7 @@ Bonita BPM image includes two parts : # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/buildpack-deps/README.md b/buildpack-deps/README.md index fd40de0e..56a22ca7 100644 --- a/buildpack-deps/README.md +++ b/buildpack-deps/README.md @@ -59,7 +59,7 @@ View [license information](https://www.debian.org/social_contract#guidelines) fo # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/busybox/README.md b/busybox/README.md index 6aa8ee40..d1f4be37 100644 --- a/busybox/README.md +++ b/busybox/README.md @@ -49,7 +49,7 @@ View [license information](http://www.busybox.net/license.html) for the software # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/cassandra/README.md b/cassandra/README.md index 9335ec16..0a701abc 100644 --- a/cassandra/README.md +++ b/cassandra/README.md @@ -168,7 +168,7 @@ If there is no database initialized when the container starts, then a default da # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/celery/README.md b/celery/README.md index f7acc362..392ec9e8 100644 --- a/celery/README.md +++ b/celery/README.md @@ -40,7 +40,7 @@ $ docker run --link some-redis:redis -e CELERY_BROKER_URL=redis://redis --rm cel # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/centos/README.md b/centos/README.md index 817ef89f..dd877e8b 100644 --- a/centos/README.md +++ b/centos/README.md @@ -99,7 +99,7 @@ This container is running with systemd in a limited context, but it must always # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/cirros/README.md b/cirros/README.md index 4f84d22f..e09c2703 100644 --- a/cirros/README.md +++ b/cirros/README.md @@ -16,7 +16,7 @@ CirrOS is a Tiny OS that specializes in running on a cloud. # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/clojure/README.md b/clojure/README.md index d3560769..d06e587e 100644 --- a/clojure/README.md +++ b/clojure/README.md @@ -84,7 +84,7 @@ View [license information](http://clojure.org/license) for the software containe # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/couchbase/README.md b/couchbase/README.md index ed86d110..e29ec98f 100644 --- a/couchbase/README.md +++ b/couchbase/README.md @@ -267,7 +267,7 @@ By default, the `latest` Docker tag points to the latest Enterprise Edition, as # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/crate/README.md b/crate/README.md index 40320ea3..53ed4fec 100644 --- a/crate/README.md +++ b/crate/README.md @@ -96,7 +96,7 @@ View [license information](https://github.com/crate/crate/blob/master/LICENSE.tx # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/crux/README.md b/crux/README.md index e231598f..4a1688e0 100644 --- a/crux/README.md +++ b/crux/README.md @@ -24,7 +24,7 @@ Finally, it strives to use new features as they become available, as long as the # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/debian/README.md b/debian/README.md index b17d9df6..6040000c 100644 --- a/debian/README.md +++ b/debian/README.md @@ -48,7 +48,7 @@ deb http://security.debian.org jessie/updates main # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/django/README.md b/django/README.md index 14529c9a..cad095f8 100644 --- a/django/README.md +++ b/django/README.md @@ -82,7 +82,7 @@ View [license information](https://github.com/django/django/blob/master/LICENSE) # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/docker-dev/README.md b/docker-dev/README.md index fa74e23d..9a80f9ae 100644 --- a/docker-dev/README.md +++ b/docker-dev/README.md @@ -22,7 +22,7 @@ If you are looking for an up-to-date development environment for doing developme # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/docker/README.md b/docker/README.md index cf4ad5d0..e8d9e528 100644 --- a/docker/README.md +++ b/docker/README.md @@ -155,7 +155,7 @@ View [license information](https://github.com/docker/docker/blob/eb7b2ed6bbe3fbe # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/drupal/README.md b/drupal/README.md index 9267f6d2..2426234c 100644 --- a/drupal/README.md +++ b/drupal/README.md @@ -72,7 +72,7 @@ View [license information](https://www.drupal.org/licensing/faq) for the softwar # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/elasticsearch/README.md b/elasticsearch/README.md index dc3e9d58..9662ef77 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -55,7 +55,7 @@ View [license information](https://github.com/elasticsearch/elasticsearch/blob/6 # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/erlang/README.md b/erlang/README.md index 1db15572..6d71edd0 100644 --- a/erlang/README.md +++ b/erlang/README.md @@ -65,7 +65,7 @@ View [license information](http://www.erlang.org/about.html) for the software co # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/fedora/README.md b/fedora/README.md index 8be139be..48aa9435 100644 --- a/fedora/README.md +++ b/fedora/README.md @@ -31,7 +31,7 @@ metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasev # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/gazebo/README.md b/gazebo/README.md index f2e3a8bc..67c87d85 100644 --- a/gazebo/README.md +++ b/gazebo/README.md @@ -158,7 +158,7 @@ Gazebo is open-source licensed under [Apache 2.0](http://opensource.org/licenses # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/gcc/README.md b/gcc/README.md index 6a9cab65..677d715b 100644 --- a/gcc/README.md +++ b/gcc/README.md @@ -58,7 +58,7 @@ View [license information](https://gcc.gnu.org/viewcvs/gcc/trunk/gcc/COPYING3?vi # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/ghost/README.md b/ghost/README.md index 8999a7b2..f5903382 100644 --- a/ghost/README.md +++ b/ghost/README.md @@ -44,7 +44,7 @@ $ docker run --name some-ghost --volumes-from some-ghost-data ghost # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/glassfish/README.md b/glassfish/README.md index e19db783..7fd8bbb8 100644 --- a/glassfish/README.md +++ b/glassfish/README.md @@ -17,7 +17,7 @@ GlassFish is the reference implementation of Java EE and as such supports Enterp # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/golang/README.md b/golang/README.md index d92b575c..9e4a6601 100644 --- a/golang/README.md +++ b/golang/README.md @@ -105,7 +105,7 @@ View [license information](http://golang.org/LICENSE) for the software contained # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/haproxy/README.md b/haproxy/README.md index 2a7d3236..5b461bb1 100644 --- a/haproxy/README.md +++ b/haproxy/README.md @@ -52,7 +52,7 @@ View [license information](http://www.haproxy.org/download/1.5/doc/LICENSE) for # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/haskell/README.md b/haskell/README.md index 12c72e99..222b2eba 100644 --- a/haskell/README.md +++ b/haskell/README.md @@ -83,7 +83,7 @@ This image is licensed under the MIT License (see [LICENSE](https://github.com/d # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/hello-world/README.md b/hello-world/README.md index 8da572f1..2f4dfb5c 100644 --- a/hello-world/README.md +++ b/hello-world/README.md @@ -45,7 +45,7 @@ This image is a prime example of using the [`scratch`](https://registry.hub.dock # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/hipache/README.md b/hipache/README.md index c3d5ccf9..ff1f65f8 100644 --- a/hipache/README.md +++ b/hipache/README.md @@ -14,7 +14,7 @@ Hipache was originally developed at [dotCloud](http://www.dotcloud.com), a popul # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/httpd/README.md b/httpd/README.md index 344de213..61712f2a 100644 --- a/httpd/README.md +++ b/httpd/README.md @@ -62,7 +62,7 @@ View [license information](https://www.apache.org/licenses/) for the software co # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/hylang/README.md b/hylang/README.md index 28b9a65b..33086275 100644 --- a/hylang/README.md +++ b/hylang/README.md @@ -46,7 +46,7 @@ View [license information](https://github.com/hylang/hy/blob/master/LICENSE) for # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/iojs/README.md b/iojs/README.md index 027a3289..37453d5f 100644 --- a/iojs/README.md +++ b/iojs/README.md @@ -77,7 +77,7 @@ View [license information](https://github.com/iojs/io.js/blob/master/LICENSE) fo # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/irssi/README.md b/irssi/README.md index faf68305..cea678da 100644 --- a/irssi/README.md +++ b/irssi/README.md @@ -56,7 +56,7 @@ View [license information](https://github.com/irssi/irssi/blob/master/COPYING) f # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/java/README.md b/java/README.md index cad24379..d3d5f63b 100644 --- a/java/README.md +++ b/java/README.md @@ -69,7 +69,7 @@ View [license information](http://openjdk.java.net/legal/gplv2+ce.html) for the # Supported Docker versions -This image is officially supported on Docker version 1.9.0. +This image is officially supported on Docker version 1.9.1. Support for older versions (down to 1.6) is provided on a best-effort basis. diff --git a/jenkins/README.md b/jenkins/README.md index b458f1a4..59c0df9b 100644 --- a/jenkins/README.md +++ b/jenkins/README.md @@ -17,45 +17,158 @@ This is a fully functional Jenkins server, based on the Long Term Support releas # How to use this image ```console -$ docker run -p 8080:8080 jenkins +docker run -p 8080:8080 -p 50000:50000 jenkins ``` -This will store the workspace in /var/jenkins_home. All Jenkins data lives in there - including plugins and configuration. You will probably want to make that a persistent volume: +This will store the workspace in /var/jenkins_home. All Jenkins data lives in there - including plugins and configuration. You will probably want to make that a persistent volume (recommended): ```console -$ docker run --name myjenkins -p 8080:8080 -v /var/jenkins_home jenkins +docker run -p 8080:8080 -p 50000:50000 -v /your/home:/var/jenkins_home jenkins ``` -The volume for the "myjenkins" named container will then be persistent. +This will store the jenkins data in `/your/home` on the host. Ensure that `/your/home` is accessible by the jenkins user in container (jenkins user - uid 1000) or use `-u some_other_user` parameter with `docker run`. -You can also bind mount in a volume from the host: - -First, ensure that /your/home is accessible by the jenkins user in container (jenkins user - uid 102 normally - or use -u root), then: +You can also use a volume container: ```console -$ docker run -p 8080:8080 -v /your/home:/var/jenkins_home jenkins +docker run --name myjenkins -p 8080:8080 -p 50000:50000 -v /var/jenkins_home jenkins ``` +Then myjenkins container has the volume (please do read about docker volume handling to find out more). + ## Backing up data If you bind mount in a volume - you can simply back up that directory (which is jenkins_home) at any time. -If your volume is inside a container - you can use `docker cp -$ID:/var/jenkins_home` command to extract the data. +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. -## Attaching build executors +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) -You can run builds on the master (out of the box) buf if you want to attach build slave servers: make sure you map the port: `-p 50000:50000` - which will be used when you connect a slave agent. +For more info check Docker docs section on [Managing data in containers](https://docs.docker.com/userguide/dockervolumes/) -[Here](https://registry.hub.docker.com/u/maestrodev/build-agent/) is an example docker container you can use as a build server with lots of good tools installed - which is well worth trying. +# Setting the number of executors -## Upgrading +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 : + +`executors.groovy` + + import jenkins.model.* + Jenkins.instance.setNumExecutors(5) + +and `Dockerfile` + +```console +FROM jenkins +COPY executors.groovy /usr/share/jenkins/ref/init.groovy.d/executors.groovy +``` + +# Attaching build executors + +You can run builds on the master (out of the box) but if you want to attach build slave servers: make sure you map the port: `-p 50000:50000` - which will be used when you connect a slave agent. + +# Passing JVM parameters + +You might need to customize the JVM running Jenkins, typically to pass system properties or tweak heap memory settings. Use JAVA_OPTS environment variable for this purpose : + +```console +docker run --name myjenkins -p 8080:8080 -p 50000:50000 --env JAVA_OPTS=-Dhudson.footerURL=http://mycompany.com jenkins +``` + +# Configuring logging + +Jenkins logging can be configured through a properties file and `java.util.logging.config.file` Java property. For example: + +```console +mkdir data +cat > data/log.properties <