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/05/06 13:25:16 UTC
[myfaces-tobago] branch master updated: next staging version
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 09954ad next staging version
09954ad is described below
commit 09954adea6be788be94bd39b5e2e73cbdde95361
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Sun May 6 15:14:59 2018 +0200
next staging version
---
.../main/tobago-vm/docker/apache-proxy/index.html | 4 ++--
.../src/main/tobago-vm/docker/docker-compose.yml | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 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 5c12c59..32eff26 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
@@ -28,8 +28,8 @@
{
major: "4",
release: "4.2.0",
- staging: "",
- snapshot: "4.2.1-SNAPSHOT",
+ staging: "4.2.1",
+ snapshot: "4.2.2-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 9e2343b..09d3921 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
@@ -59,14 +59,14 @@ services:
- 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-staging:
+ build: tomcat
+ environment:
+ - TOBAGO_VERSION=4.2.1
+ - STAGING_NUMBER=1134
+ - 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.