diff --git a/gcc/README.md b/gcc/README.md index 678dd5657..93f3d7440 100644 --- a/gcc/README.md +++ b/gcc/README.md @@ -19,7 +19,7 @@ WARNING: - [`4.9.4`, `4.9`, `4` (*4.9/Dockerfile*)](https://github.com/docker-library/gcc/blob/3b33871fe9558262cb5ed6253d358f76710e9ccb/4.9/Dockerfile) - [`5.4.0`, `5.4`, `5` (*5/Dockerfile*)](https://github.com/docker-library/gcc/blob/3b33871fe9558262cb5ed6253d358f76710e9ccb/5/Dockerfile) - [`6.4.0`, `6.4`, `6` (*6/Dockerfile*)](https://github.com/docker-library/gcc/blob/c1fe37de30fbe69e83f042b4a9426b11cb624bca/6/Dockerfile) -- [`7.1.0`, `7.1`, `7`, `latest` (*7/Dockerfile*)](https://github.com/docker-library/gcc/blob/3b33871fe9558262cb5ed6253d358f76710e9ccb/7/Dockerfile) +- [`7.2.0`, `7.2`, `7`, `latest` (*7/Dockerfile*)](https://github.com/docker-library/gcc/blob/3ccb804e330766ba05abe7fe990512f152a08254/7/Dockerfile) # Quick reference diff --git a/ghost/README.md b/ghost/README.md index df7018663..4909ae733 100644 --- a/ghost/README.md +++ b/ghost/README.md @@ -16,8 +16,8 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`1.5.2`, `1.5`, `1`, `latest` (*1/debian/Dockerfile*)](https://github.com/docker-library/ghost/blob/a9b023e922f4f44c4c15f765973c2939f1be9b12/1/debian/Dockerfile) -- [`1.5.2-alpine`, `1.5-alpine`, `1-alpine`, `alpine` (*1/alpine/Dockerfile*)](https://github.com/docker-library/ghost/blob/a9b023e922f4f44c4c15f765973c2939f1be9b12/1/alpine/Dockerfile) +- [`1.6.1`, `1.6`, `1`, `latest` (*1/debian/Dockerfile*)](https://github.com/docker-library/ghost/blob/3989f7fc344559a0d65208a56ddf1adc1b7753ac/1/debian/Dockerfile) +- [`1.6.1-alpine`, `1.6-alpine`, `1-alpine`, `alpine` (*1/alpine/Dockerfile*)](https://github.com/docker-library/ghost/blob/3989f7fc344559a0d65208a56ddf1adc1b7753ac/1/alpine/Dockerfile) - [`0.11.11`, `0.11`, `0` (*0/debian/Dockerfile*)](https://github.com/docker-library/ghost/blob/fabb247507dc8b2d20c5795d688c4167b98caf4a/0/debian/Dockerfile) - [`0.11.11-alpine`, `0.11-alpine`, `0-alpine` (*0/alpine/Dockerfile*)](https://github.com/docker-library/ghost/blob/fabb247507dc8b2d20c5795d688c4167b98caf4a/0/alpine/Dockerfile) diff --git a/hello-world/README.md b/hello-world/README.md index 40450fa35..93421e4af 100644 --- a/hello-world/README.md +++ b/hello-world/README.md @@ -72,7 +72,7 @@ For more examples and ideas, visit: $ docker images hello-world REPOSITORY TAG IMAGE ID SIZE -hello-world latest 1815c82652c0 1.84kB +hello-world latest 1815c82652c0 1.84 kB ``` ![logo](https://raw.githubusercontent.com/docker-library/docs/01c12653951b2fe592c1f93a13b4e289ada0e3a1/hello-world/logo.png) diff --git a/hello-world/content.md b/hello-world/content.md index 804460cbe..b7a7eb18b 100644 --- a/hello-world/content.md +++ b/hello-world/content.md @@ -26,7 +26,7 @@ For more examples and ideas, visit: $ docker images hello-world REPOSITORY TAG IMAGE ID SIZE -hello-world latest 1815c82652c0 1.84kB +hello-world latest 1815c82652c0 1.84 kB ``` %%LOGO%% diff --git a/nextcloud/README.md b/nextcloud/README.md index 171b0f548..1b9d86117 100644 --- a/nextcloud/README.md +++ b/nextcloud/README.md @@ -20,8 +20,8 @@ WARNING: - [`10.0.6-fpm`, `10.0-fpm`, `10-fpm` (*10.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/e714562be972718c33d06d875e4d53ac63a9aeec/10.0/fpm/Dockerfile) - [`11.0.4-apache`, `11.0-apache`, `11-apache`, `11.0.4`, `11.0`, `11` (*11.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/444cd43edfdeef05744a5641c913b03583de7894/11.0/apache/Dockerfile) - [`11.0.4-fpm`, `11.0-fpm`, `11-fpm` (*11.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/444cd43edfdeef05744a5641c913b03583de7894/11.0/fpm/Dockerfile) -- [`12.0.1-apache`, `12.0-apache`, `12-apache`, `apache`, `12.0.1`, `12.0`, `12`, `latest` (*12.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/444cd43edfdeef05744a5641c913b03583de7894/12.0/apache/Dockerfile) -- [`12.0.1-fpm`, `12.0-fpm`, `12-fpm`, `fpm` (*12.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/444cd43edfdeef05744a5641c913b03583de7894/12.0/fpm/Dockerfile) +- [`12.0.2-apache`, `12.0-apache`, `12-apache`, `apache`, `12.0.2`, `12.0`, `12`, `latest` (*12.0/apache/Dockerfile*)](https://github.com/nextcloud/docker/blob/2220249a20b6b92e25f51eb7c1f39a77b7838c49/12.0/apache/Dockerfile) +- [`12.0.2-fpm`, `12.0-fpm`, `12-fpm`, `fpm` (*12.0/fpm/Dockerfile*)](https://github.com/nextcloud/docker/blob/2220249a20b6b92e25f51eb7c1f39a77b7838c49/12.0/fpm/Dockerfile) # Quick reference diff --git a/rabbitmq/README.md b/rabbitmq/README.md index 9c2ebb98e..6c681d8a0 100644 --- a/rabbitmq/README.md +++ b/rabbitmq/README.md @@ -16,10 +16,10 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`3.6.10`, `3.6`, `3`, `latest` (*3.6/debian/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/7eed5476d6153d05e5a0245ccfe28d893b0b369e/3.6/debian/Dockerfile) -- [`3.6.10-management`, `3.6-management`, `3-management`, `management` (*3.6/debian/management/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/79277042564875d55e4b05a60c65b6eb46651a94/3.6/debian/management/Dockerfile) -- [`3.6.10-alpine`, `3.6-alpine`, `3-alpine`, `alpine` (*3.6/alpine/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/192f4c2055cc97cd8200c80c97b9e66115c13790/3.6/alpine/Dockerfile) -- [`3.6.10-management-alpine`, `3.6-management-alpine`, `3-management-alpine`, `management-alpine` (*3.6/alpine/management/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/79277042564875d55e4b05a60c65b6eb46651a94/3.6/alpine/management/Dockerfile) +- [`3.6.11`, `3.6`, `3`, `latest` (*3.6/debian/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/7d76799247764423a69438f72961ef0581788e07/3.6/debian/Dockerfile) +- [`3.6.11-management`, `3.6-management`, `3-management`, `management` (*3.6/debian/management/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/79277042564875d55e4b05a60c65b6eb46651a94/3.6/debian/management/Dockerfile) +- [`3.6.11-alpine`, `3.6-alpine`, `3-alpine`, `alpine` (*3.6/alpine/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/8047bd34685f27bea47dcd646d3b6332b0ec22d3/3.6/alpine/Dockerfile) +- [`3.6.11-management-alpine`, `3.6-management-alpine`, `3-management-alpine`, `management-alpine` (*3.6/alpine/management/Dockerfile*)](https://github.com/docker-library/rabbitmq/blob/79277042564875d55e4b05a60c65b6eb46651a94/3.6/alpine/management/Dockerfile) # Quick reference diff --git a/vault/README.md b/vault/README.md index fb782b4fc..1eca31977 100644 --- a/vault/README.md +++ b/vault/README.md @@ -21,7 +21,8 @@ WARNING: - [`0.7.0` (*0.7.0/Dockerfile*)](https://github.com/hashicorp/docker-vault/blob/02af9417ae42bf6290b4b36c2188b1836f1017a8/0.7.0/Dockerfile) - [`0.7.2` (*0.7.2/Dockerfile*)](https://github.com/hashicorp/docker-vault/blob/02af9417ae42bf6290b4b36c2188b1836f1017a8/0.7.2/Dockerfile) - [`0.7.3` (*0.7.3/Dockerfile*)](https://github.com/hashicorp/docker-vault/blob/02af9417ae42bf6290b4b36c2188b1836f1017a8/0.7.3/Dockerfile) -- [`0.8.0`, `latest` (*0.8.0/Dockerfile*)](https://github.com/hashicorp/docker-vault/blob/d1cbdce2b531e9223356efb14e828afa556e1f70/0.8.0/Dockerfile) +- [`0.8.0` (*0.8.0/Dockerfile*)](https://github.com/hashicorp/docker-vault/blob/d1cbdce2b531e9223356efb14e828afa556e1f70/0.8.0/Dockerfile) +- [`0.8.1`, `latest` (*0.8.1/Dockerfile*)](https://github.com/hashicorp/docker-vault/blob/9ddc187d94f68f2572e4d3b1e733c98c661d628b/0.8.1/Dockerfile) # Quick reference diff --git a/wordpress/README.md b/wordpress/README.md index 7c9b17efc..a2380c07e 100644 --- a/wordpress/README.md +++ b/wordpress/README.md @@ -16,15 +16,15 @@ WARNING: # Supported tags and respective `Dockerfile` links -- [`4.8.1-apache`, `4.8-apache`, `4-apache`, `apache`, `4.8.1`, `4.8`, `4`, `latest`, `4.8.1-php5.6-apache`, `4.8-php5.6-apache`, `4-php5.6-apache`, `php5.6-apache`, `4.8.1-php5.6`, `4.8-php5.6`, `4-php5.6`, `php5.6` (*php5.6/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php5.6/apache/Dockerfile) -- [`4.8.1-fpm`, `4.8-fpm`, `4-fpm`, `fpm`, `4.8.1-php5.6-fpm`, `4.8-php5.6-fpm`, `4-php5.6-fpm`, `php5.6-fpm` (*php5.6/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php5.6/fpm/Dockerfile) -- [`4.8.1-fpm-alpine`, `4.8-fpm-alpine`, `4-fpm-alpine`, `fpm-alpine`, `4.8.1-php5.6-fpm-alpine`, `4.8-php5.6-fpm-alpine`, `4-php5.6-fpm-alpine`, `php5.6-fpm-alpine` (*php5.6/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php5.6/fpm-alpine/Dockerfile) -- [`4.8.1-php7.0-apache`, `4.8-php7.0-apache`, `4-php7.0-apache`, `php7.0-apache`, `4.8.1-php7.0`, `4.8-php7.0`, `4-php7.0`, `php7.0` (*php7.0/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php7.0/apache/Dockerfile) -- [`4.8.1-php7.0-fpm`, `4.8-php7.0-fpm`, `4-php7.0-fpm`, `php7.0-fpm` (*php7.0/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php7.0/fpm/Dockerfile) -- [`4.8.1-php7.0-fpm-alpine`, `4.8-php7.0-fpm-alpine`, `4-php7.0-fpm-alpine`, `php7.0-fpm-alpine` (*php7.0/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php7.0/fpm-alpine/Dockerfile) -- [`4.8.1-php7.1-apache`, `4.8-php7.1-apache`, `4-php7.1-apache`, `php7.1-apache`, `4.8.1-php7.1`, `4.8-php7.1`, `4-php7.1`, `php7.1` (*php7.1/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php7.1/apache/Dockerfile) -- [`4.8.1-php7.1-fpm`, `4.8-php7.1-fpm`, `4-php7.1-fpm`, `php7.1-fpm` (*php7.1/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php7.1/fpm/Dockerfile) -- [`4.8.1-php7.1-fpm-alpine`, `4.8-php7.1-fpm-alpine`, `4-php7.1-fpm-alpine`, `php7.1-fpm-alpine` (*php7.1/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/c3c8a37506b1bd79ae05e547faa3d31c84620051/php7.1/fpm-alpine/Dockerfile) +- [`4.8.1-apache`, `4.8-apache`, `4-apache`, `apache`, `4.8.1`, `4.8`, `4`, `latest`, `4.8.1-php5.6-apache`, `4.8-php5.6-apache`, `4-php5.6-apache`, `php5.6-apache`, `4.8.1-php5.6`, `4.8-php5.6`, `4-php5.6`, `php5.6` (*php5.6/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php5.6/apache/Dockerfile) +- [`4.8.1-fpm`, `4.8-fpm`, `4-fpm`, `fpm`, `4.8.1-php5.6-fpm`, `4.8-php5.6-fpm`, `4-php5.6-fpm`, `php5.6-fpm` (*php5.6/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php5.6/fpm/Dockerfile) +- [`4.8.1-fpm-alpine`, `4.8-fpm-alpine`, `4-fpm-alpine`, `fpm-alpine`, `4.8.1-php5.6-fpm-alpine`, `4.8-php5.6-fpm-alpine`, `4-php5.6-fpm-alpine`, `php5.6-fpm-alpine` (*php5.6/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php5.6/fpm-alpine/Dockerfile) +- [`4.8.1-php7.0-apache`, `4.8-php7.0-apache`, `4-php7.0-apache`, `php7.0-apache`, `4.8.1-php7.0`, `4.8-php7.0`, `4-php7.0`, `php7.0` (*php7.0/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php7.0/apache/Dockerfile) +- [`4.8.1-php7.0-fpm`, `4.8-php7.0-fpm`, `4-php7.0-fpm`, `php7.0-fpm` (*php7.0/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php7.0/fpm/Dockerfile) +- [`4.8.1-php7.0-fpm-alpine`, `4.8-php7.0-fpm-alpine`, `4-php7.0-fpm-alpine`, `php7.0-fpm-alpine` (*php7.0/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php7.0/fpm-alpine/Dockerfile) +- [`4.8.1-php7.1-apache`, `4.8-php7.1-apache`, `4-php7.1-apache`, `php7.1-apache`, `4.8.1-php7.1`, `4.8-php7.1`, `4-php7.1`, `php7.1` (*php7.1/apache/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php7.1/apache/Dockerfile) +- [`4.8.1-php7.1-fpm`, `4.8-php7.1-fpm`, `4-php7.1-fpm`, `php7.1-fpm` (*php7.1/fpm/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php7.1/fpm/Dockerfile) +- [`4.8.1-php7.1-fpm-alpine`, `4.8-php7.1-fpm-alpine`, `4-php7.1-fpm-alpine`, `php7.1-fpm-alpine` (*php7.1/fpm-alpine/Dockerfile*)](https://github.com/docker-library/wordpress/blob/7902c5f856c7fbc20dd70762bef324158328dcff/php7.1/fpm-alpine/Dockerfile) - [`cli-1.3.0`, `cli-1.3`, `cli-1`, `cli`, `cli-1.3.0-php5.6`, `cli-1.3-php5.6`, `cli-1-php5.6`, `cli-php5.6` (*php5.6/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/93bc135b2fad658fe041447209c1a379a16dd302/php5.6/cli/Dockerfile) - [`cli-1.3.0-php7.0`, `cli-1.3-php7.0`, `cli-1-php7.0`, `cli-php7.0` (*php7.0/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/93bc135b2fad658fe041447209c1a379a16dd302/php7.0/cli/Dockerfile) - [`cli-1.3.0-php7.1`, `cli-1.3-php7.1`, `cli-1-php7.1`, `cli-php7.1` (*php7.1/cli/Dockerfile*)](https://github.com/docker-library/wordpress/blob/93bc135b2fad658fe041447209c1a379a16dd302/php7.1/cli/Dockerfile) diff --git a/xwiki/README.md b/xwiki/README.md index 7bedb8cfc..6c74af666 100644 --- a/xwiki/README.md +++ b/xwiki/README.md @@ -254,6 +254,20 @@ Note that if you want to set a custom version of XWiki you can edit the `.env` f Note that `docker-compose up` will automatically build the XWiki image on the first run. If you need to rebuild it you can issue `docker-compose up --build`. You can also build the image with `docker build . -t xwiki-mysql-tomcat:latest` for example. +# Upgrading XWiki + +You've installed an XWiki docker image and used it and now comes the time when you'd like to upgrade XWiki to a newer version. + +If you've followed the instructions above you've mapped the XWiki permanent directory to a local directory on your host. + +Thus all you need to do is to execute the installation instructions above as if you were installing a new version of the XWiki docker image. + +Then you need to stop your running XWiki container. You should keep your DB container running. Then all you have to do is start a new container as described above, using the new XWiki docker image. + +Caveats: + +- Right now we have an [outstanding issue](https://jira.xwiki.org/browse/XDOCKER-20) and thus if you've had to modify `xwiki.properties` or `xwiki.cfg` inside the XWiki container, you'll need to port your changes inside the new container (see the section below). + # Details for the xwiki image ## Configuration Options @@ -265,6 +279,14 @@ The first time you create a container out of the xwiki image, a shell script (`/ - `DB_DATABASE`: The name of the XWiki database to use/create. - `DB_HOST`: The name of the host (or docker container) containing the database. Default is "db". +If you need to configure XWiki (e.g. modify `xwiki.properties` or `xwiki.cfg`) or perform some additional configuration, you can execute another container and attach to the running XWiki container by issuing: + +```console +docker exec -it bash -l +``` + +Note that we plan to [lift this limitation in the future](https://jira.xwiki.org/browse/XDOCKER-20). + ## Passing JVM options It's possible to pass JVM options to Tomcat by defining the `JAVA_OPTS` environment property.