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 2018/04/25 08:14:59 UTC
[myfaces-tobago] branch master updated: update versions
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 7ed6e25 update versions
7ed6e25 is described below
commit 7ed6e25126488ad7ce350c12d5a0e4045524e8cc
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed Apr 25 10:14:44 2018 +0200
update versions
---
.../main/tobago-vm/docker/apache-proxy/index.html | 4 ++--
.../src/main/tobago-vm/docker/docker-compose.yml | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 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 4c678a3..5c12c59 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 @@
var versions = [
{
major: "4",
- release: "4.1.0",
- staging: "4.2.0",
+ release: "4.2.0",
+ staging: "",
snapshot: "4.2.1-SNAPSHOT",
link: "4",
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 33e4515..9e2343b 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
@@ -22,7 +22,7 @@ services:
# todo - "443:443"
links:
- demo-4-release
- - demo-4-staging
+# - demo-4-staging
- demo-4-snapshot
- demo-3-release
# - demo-3-staging
@@ -38,7 +38,7 @@ services:
# - demo-1-0-snapshot
depends_on:
- demo-4-release
- - demo-4-staging
+# - demo-4-staging
- demo-4-snapshot
- demo-3-release
# - demo-3-staging
@@ -55,18 +55,18 @@ services:
demo-4-release:
build: tomcat
environment:
- - TOBAGO_VERSION=4.1.0
- - CONTEXT_PATH=demo-4-release
- volumes:
- - /opt/docker/artifacts:/opt/docker/artifacts
- demo-4-staging:
- build: tomcat
- environment:
- TOBAGO_VERSION=4.2.0
- - STAGING_NUMBER=1132
- - CONTEXT_PATH=demo-4-staging
+ - CONTEXT_PATH=demo-4-release
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
+# demo-4-staging:
+# build: tomcat
+# environment:
+# - TOBAGO_VERSION=4.2.0
+# - STAGING_NUMBER=1132
+# - CONTEXT_PATH=demo-4-staging
+# volumes:
+# - /opt/docker/artifacts:/opt/docker/artifacts
demo-4-snapshot:
build: tomcat
environment:
--
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.