docker-library
/
docs
mirror of https://github.com/docker-library/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1012 from vmassol/patch-4 

Update documentation after the fix for https://jira.xwiki.org/browse/…
This commit is contained in:
yosifkit 2017-09-21 10:14:13 -07:00 committed by GitHub
parent 7ef392aa0c c5ee81cd51
commit 8bc2e1e4d2
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xwiki/content.md
View File

@ -216,9 +216,7 @@ Thus all you need to do is to execute the installation instructions above as if
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. 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: Note that your current XWiki configuration files (`xwiki.cfg`, `xwiki.properties` and `hibernate.cfg.xml`) will be preserved.
- 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 # Details for the xwiki image
@ -231,14 +229,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_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". - `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: The main XWiki configuration files (`xwiki.cfg`, `xwiki.properties` and `hibernate.cfg.xml`) are available in the mapped local directory for the permanent directory on your host.
If you need to perform some advanced configuration, you can execute another container and attach to the running XWiki container by issuing (but note that these won't be saved if you remove the container):
```console ```console
docker exec -it <xwiki container id> bash -l docker exec -it <xwiki container id> bash -l
``` ```
Note that we plan to [lift this limitation in the future](https://jira.xwiki.org/browse/XDOCKER-20).
## Passing JVM options ## Passing JVM options
It's possible to pass JVM options to Tomcat by defining the `JAVA_OPTS` environment property. It's possible to pass JVM options to Tomcat by defining the `JAVA_OPTS` environment property.