[myfaces-homepage] branch master updated: feat: progress automatation

[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-homepage.git


The following commit(s) were added to refs/heads/master by this push:
     new 119bfe9  feat: progress automatation
119bfe9 is described below

commit 119bfe920cc29e8c934369e11cc7079bbaf873d2
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Feb 23 14:38:36 2022 +0100

    feat: progress automatation
---
 tobago/tobago-vm.sh        | 15 ++++++++-----
 tobago/tobago-vm/README.md | 55 +++++++++++-----------------------------------
 2 files changed, 22 insertions(+), 48 deletions(-)

diff --git a/tobago/tobago-vm.sh b/tobago/tobago-vm.sh
index e7c6209..9fcf295 100755
--- a/tobago/tobago-vm.sh
+++ b/tobago/tobago-vm.sh
@@ -1,5 +1,8 @@
 #! /bin/bash
 
+# This script can be called directly like this.
+# curl -s -o /tmp/tobago-vm.sh https://raw.githubusercontent.com/apache/myfaces-homepage/master/tobago/tobago-vm.sh | bash
+
 set -e
 
 BRANCH=master
@@ -9,11 +12,11 @@ curl https://codeload.github.com/apache/myfaces-homepage/tar.gz/refs/heads/${BRA
 
 cd tobago-vm
 
-docker-compose down
-docker system prune -f
-docker-compose build
-docker-compose up -d
+/usr/local/bin/docker-compose down
+/usr/bin/docker system prune -f
+/usr/local/bin/docker-compose build
+/usr/local/bin/docker-compose up -d
 
 # need to wait for Let's encrypt
-sleep 20s
-docker exec -it tobago-vm_apache_1 apachectl graceful
+sleep 20
+/usr/bin/docker exec -it tobago-vm_apache_1 apachectl graceful
diff --git a/tobago/tobago-vm/README.md b/tobago/tobago-vm/README.md
index e93bf48..33aef19 100644
--- a/tobago/tobago-vm/README.md
+++ b/tobago/tobago-vm/README.md
@@ -1,51 +1,22 @@
 # Run the different Tobago versions on tobago-demo.apache.org 
 
-The demo on tobago-demo works with docker. 
-Each user with an account on the vm and 
-member of the docker group can manage the containers.
+The demo on https://tobago-demo.apache.org/ works with docker. 
+The system user to run manage the containers is "tobago".
 
-How to become root access is described on the
-[Apache site](https://reference.apache.org/committer/opie).
-
-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:
+## Setup
 
-```
-ssh tobago-demo.apache.org
+The setup of the vm is managed by Puppet by the Apache Infra Team in
+https://github.com/apache/infrastructure-p6/ (private).
 
-cd
-git clone https://github.com/apache/myfaces-tobago
-cd ~/myfaces-tobago/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/
+## Administration
 
-docker-compose up -d
-```
-
-## Simple Update (only restart needed containers)
-
-only minor changes like version, or staging for votes: 
-
-```
-cd ~/myfaces-tobago/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/
-git pull --rebase
-docker-compose build
-docker-compose up -d
-```
+How to become root access is described on the
+[Apache site](https://reference.apache.org/committer/opie).
 
-## Full Update
+## Updates of the demo applications
 
-Update, rebuild, run: 
+There is a crontab entry for the user to deploy the deploy
+application regualy.
 
-```
-cd ~/myfaces-tobago/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/
-git pull --rebase
-docker-compose down
-docker pull tomcat:8.5-jdk8-adoptopenjdk-hotspot
-docker pull debian:buster-slim
-docker-compose build
-docker-compose up -d
-```
+The job executes the script ../tobago-vm.sh to recreate and start 
+all docker containers.