You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2021/10/28 19:49:04 UTC
[myfaces-tobago] branch master updated: demo: update tobago-vm
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 5bc7cd6 demo: update tobago-vm
5bc7cd6 is described below
commit 5bc7cd665c3c83c9d9e7252ec4ce4d9dce0ea6bb
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Oct 28 21:46:04 2021 +0200
demo: update tobago-vm
---
.../main/tobago-vm/docker/apache-proxy/index.html | 4 +--
.../src/main/tobago-vm/docker/docker-compose.yml | 32 +++++++++++-----------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
index 85a579a..cb7d81f 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/apache-proxy/index.html
@@ -27,8 +27,8 @@
{
major: "5",
release: "5.0.0-alpha-2",
- staging: "",
- snapshot: "5.0.0-SNAPSHOT",
+ staging: "5.0.0",
+ snapshot: "5.0.1-SNAPSHOT",
link: "5",
archived: false
},
diff --git a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
index 081e066..1e94c0f 100644
--- a/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
+++ b/tobago-example/tobago-example-demo/src/main/tobago-vm/docker/docker-compose.yml
@@ -26,7 +26,7 @@ services:
max-file: "5"
links:
- demo-5-release
-# - demo-5-staging
+ - demo-5-staging
- demo-5-snapshot
- demo-4-release
# - demo-4-staging
@@ -43,7 +43,7 @@ services:
# - demo-1-0-snapshot
depends_on:
- demo-5-release
-# - demo-5-staging
+ - demo-5-staging
- demo-5-snapshot
- demo-4-release
# - demo-4-staging
@@ -67,20 +67,20 @@ services:
options:
max-size: "1m"
max-file: "5"
-# demo-5-staging:
-# build: tomcat
-# environment:
-# - TOBAGO_VERSION=5.0.0-alpha-2
-# - STAGING_NUMBER=1194
-# - CONTEXT_PATH=demo-5-staging
-# volumes:
-# - ~/tobago-vm/artifacts:/opt/docker/artifacts
-# ports:
-# - "8501:8080"
-# logging:
-# options:
-# max-size: "1m"
-# max-file: "5"
+ demo-5-staging:
+ build: tomcat
+ environment:
+ - TOBAGO_VERSION=5.0.0
+ - STAGING_NUMBER=1196
+ - CONTEXT_PATH=demo-5-staging
+ volumes:
+ - ~/tobago-vm/artifacts:/opt/docker/artifacts
+ ports:
+ - "8501:8080"
+ logging:
+ options:
+ max-size: "1m"
+ max-file: "5"
demo-5-snapshot:
build: tomcat
environment: