[myfaces-homepage] branch tobago-vm updated: doc: Enhancements for tobago-vm demo

[lo...@apache.org]

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

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


The following commit(s) were added to refs/heads/tobago-vm by this push:
     new 5f4adcd  doc: Enhancements for tobago-vm demo
5f4adcd is described below

commit 5f4adcdbd252cd9f0b4e0c8c8701ebccafed13df
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Feb 11 11:58:55 2022 +0100

    doc: Enhancements for tobago-vm demo
    
    use www-data as user for Tomcat
    
    issue: TOBAGO-2112
---
 tobago/tobago-vm.sh                | 5 ++++-
 tobago/tobago-vm/tomcat/Dockerfile | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tobago/tobago-vm.sh b/tobago/tobago-vm.sh
old mode 100644
new mode 100755
index 43e0817..ac616db
--- a/tobago/tobago-vm.sh
+++ b/tobago/tobago-vm.sh
@@ -2,7 +2,10 @@
 
 set -e
 
-curl https://codeload.github.com/apache/myfaces-homepage/tar.gz/refs/heads/master | tar xz --strip=2 myfaces-homepage-master/tobago/tobago-vm
+#BRANCH=master
+BRANCH=tobago-vm
+
+curl https://codeload.github.com/apache/myfaces-homepage/tar.gz/refs/heads/${BRANCH} | tar xz --strip=2 myfaces-homepage-tobago-vm/tobago/${BRANCH}
 
 cd tobago-vm
 
diff --git a/tobago/tobago-vm/tomcat/Dockerfile b/tobago/tobago-vm/tomcat/Dockerfile
index ebd1587..1432bee 100644
--- a/tobago/tobago-vm/tomcat/Dockerfile
+++ b/tobago/tobago-vm/tomcat/Dockerfile
@@ -30,4 +30,6 @@ RUN chmod +x /usr/local/tomcat/bin/download-deploy-and-run.sh
 #ENV TOBAGO_VERSION undefined
 #ENV CONTEXT_PATH ROOT
 
+USER www-data
+
 CMD ["download-deploy-and-run.sh"]