Skip to content
Snippets Groups Projects
Commit 22232273 authored by Vincent Massol's avatar Vincent Massol
Browse files

[Misc] Use "lts-" prefix to make it more clear that the XWiki images correspond to XWiki LTS.

parent 83d0ddbe
No related branches found
No related tags found
No related merge requests found
...@@ -102,13 +102,13 @@ Then run XWiki in another container by issuing one of the following command. ...@@ -102,13 +102,13 @@ Then run XWiki in another container by issuing one of the following command.
For MySQL: For MySQL:
```console ```console
docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/own/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_HOST=mysql-xwiki xwiki:mysql-tomcat docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/own/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_HOST=mysql-xwiki xwiki:lts-mysql-tomcat
``` ```
For PostgreSQL: For PostgreSQL:
```console ```console
docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/own/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_HOST=postgres-xwiki xwiki:postgres-tomcat docker run --net=xwiki-nw --name xwiki -p 8080:8080 -v /my/own/xwiki:/usr/local/xwiki -e DB_USER=xwiki -e DB_PASSWORD=xwiki -e DB_DATABASE=xwiki -e DB_HOST=postgres-xwiki xwiki:lts-postgres-tomcat
``` ```
Be careful to use the same DB username, password and database names that you've used on the first command to start the DB container. Also, please don't forget to add a `-e DB_HOST=` environment variable with the name of the previously created DB container so that XWiki knows where its database is. Be careful to use the same DB username, password and database names that you've used on the first command to start the DB container. Also, please don't forget to add a `-e DB_HOST=` environment variable with the name of the previously created DB container so that XWiki knows where its database is.
...@@ -141,7 +141,7 @@ networks: ...@@ -141,7 +141,7 @@ networks:
driver: bridge driver: bridge
services: services:
web: web:
image: "xwiki:mysql-tomcat" image: "xwiki:lts-mysql-tomcat"
container_name: xwiki-mysql-tomcat-web container_name: xwiki-mysql-tomcat-web
depends_on: depends_on:
- db - db
...@@ -189,7 +189,7 @@ networks: ...@@ -189,7 +189,7 @@ networks:
driver: bridge driver: bridge
services: services:
web: web:
image: "xwiki:postgres-tomcat" image: "xwiki:lts-postgres-tomcat"
container_name: xwiki-postgres-tomcat-web container_name: xwiki-postgres-tomcat-web
depends_on: depends_on:
- db - db
...@@ -250,7 +250,7 @@ To deploy this example, save the following YAML as `xwiki-stack.yaml`, then run: ...@@ -250,7 +250,7 @@ To deploy this example, save the following YAML as `xwiki-stack.yaml`, then run:
version: '3.3' version: '3.3'
services: services:
web: web:
image: "xwiki:mysql-tomcat" image: "xwiki:lts-mysql-tomcat"
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
...@@ -316,7 +316,7 @@ To deploy this example, save the following YAML as `xwiki-stack.yaml` then run: ...@@ -316,7 +316,7 @@ To deploy this example, save the following YAML as `xwiki-stack.yaml` then run:
version: '3.3' version: '3.3'
services: services:
web: web:
image: "xwiki:mysql-postgres" image: "xwiki:lts-mysql-postgres"
ports: ports:
- "8080:8080" - "8080:8080"
environment: environment:
...@@ -413,7 +413,7 @@ docker run \ ...@@ -413,7 +413,7 @@ docker run \
-e DB_DATABASE=xwiki \ -e DB_DATABASE=xwiki \
-e DB_HOST=mysql-xwiki \ -e DB_HOST=mysql-xwiki \
-e INDEX_HOST=solr-xwiki \ -e INDEX_HOST=solr-xwiki \
-d xwiki:mysql-tomcat -d xwiki:lts-mysql-tomcat
``` ```
#### Docker Compose example #### Docker Compose example
...@@ -427,7 +427,7 @@ networks: ...@@ -427,7 +427,7 @@ networks:
driver: bridge driver: bridge
services: services:
web: web:
image: "xwiki:mysql-tomcat" image: "xwiki:lts-mysql-tomcat"
container_name: xwiki-web container_name: xwiki-web
depends_on: depends_on:
- db - db
......
...@@ -24,7 +24,7 @@ networks: ...@@ -24,7 +24,7 @@ networks:
services: services:
web: web:
# Use an already built XWiki image from DockerHub. # Use an already built XWiki image from DockerHub.
image: "xwiki:mysql-tomcat" image: "xwiki:lts-mysql-tomcat"
container_name: xwiki-mysql-tomcat-web container_name: xwiki-mysql-tomcat-web
depends_on: depends_on:
- db - db
......
...@@ -24,7 +24,7 @@ networks: ...@@ -24,7 +24,7 @@ networks:
services: services:
web: web:
# Use an already built XWiki image from DockerHub. # Use an already built XWiki image from DockerHub.
image: "xwiki:postgres-tomcat" image: "xwiki:lts-postgres-tomcat"
container_name: xwiki-postgres-tomcat-web container_name: xwiki-postgres-tomcat-web
depends_on: depends_on:
- db - db
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.