[myfaces-tobago] branch master updated: update howto documentation for updating the vm

[lo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git


The following commit(s) were added to refs/heads/master by this push:
     new 1ae90bc  update howto documentation for updating the vm
1ae90bc is described below

commit 1ae90bce38568dd0b1b1efb2b4097bd44be157c2
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Feb 9 19:31:41 2018 +0100

    update howto documentation for updating the vm
---
 .../src/main/tobago-vm/docker/readme.md            | 41 +++++++++++++++-------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/readme.md b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/readme.md
index db40259..608bbed 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/readme.md
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/readme.md
@@ -1,33 +1,48 @@
-## Run the different Tobago versions on tobago-vm.apache.org 
+# Run the different Tobago versions on tobago-vm.apache.org 
+
+The demo on tobago-vm works with docker. 
+Each user with an account on the vm and 
+member of the docker group can manage the containers.
+
+There is a copy of the source code repo of Tobago in the directory 
+```/opt/docker/tobago/``` which contains the docker-compose configuration 
+in ```tobago-example/tobago-example-demo/src/main/tobago-vm/docker/```.
+
+## Initial installation
 
 Copy these file to the server and login there:
 
 ```
 ssh tobago-vm.apache.org
 
-git checkout ...
-cd tobago
+cd /opt/docker
+git checkout https://github.com/apache/myfaces-tobago tobago
+chmod o+w -R tobago
+cd /opt/docker/tobago/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/
+
+docker-compose up -d
+```
 
-or 
+## Simple Update (only restart needed containers)
 
-cd tobago
-git pull --rebase
+only minor changes like version, or staging for votes: 
 
-cd tobago-example/tobago-example-demo/src/main/tobago-vm/docker/
+```
+cd /opt/docker/tobago/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/
+git pull --rebase
+docker-compose up -d
 ```
 
+## Full Update
+
 Update, rebuild, run: 
 
 ```
+cd /opt/docker/tobago/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/
+git pull --rebase
 docker-compose down
-
 docker pull tomcat:8.5-jre8
 docker pull debian:stable-slim
-
 docker-compose build
-
 docker-compose up -d
 ```
-
-TODOs:
-* Create and use the "docker" or "demo" user.
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.