[myfaces-tobago] branch master updated: current ansible is using python3

[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 29931a0  current ansible is using python3
29931a0 is described below

commit 29931a06f1df09126df72cead1478ab282432776
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Sat Jan 9 11:15:59 2021 +0100

    current ansible is using python3
---
 .../tobago-example-demo/src/main/tobago-vm/docker/README.md           | 4 ++--
 .../tobago-example-demo/src/main/tobago-vm/docker/tomcat/Dockerfile   | 2 +-
 2 files changed, 3 insertions(+), 3 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 ed50f3e..6c0e4cc 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
@@ -45,8 +45,8 @@ 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 pull tomcat:8.5-jdk8-adoptopenjdk-hotspot
+docker pull debian:buster-slim
 docker-compose build
 docker-compose up -d
 ```
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/tomcat/Dockerfile b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/tomcat/Dockerfile
index a10e93d..ebd1587 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/tomcat/Dockerfile
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/tomcat/Dockerfile
@@ -18,7 +18,7 @@ MAINTAINER dev@myfaces.apache.org
 
 # ansible is needed for downloading from Nexus, todo: may be changed to mvn
 RUN apt-get update \
- && apt-get install -y less vim procps ansible python-lxml\
+ && apt-get install -y less vim procps ansible python3-lxml\
  && apt-get clean
 
 RUN rm -r /usr/local/tomcat/webapps.dist