myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hno...@apache.org
Subject [myfaces-tobago] branch master updated: update docker tobago-vm
Date Wed, 14 Feb 2018 09:17:23 GMT
This is an automated email from the ASF dual-hosted git repository.

hnoeth 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 89ff3aa  update docker tobago-vm
89ff3aa is described below

commit 89ff3aa78e534eed1ae0e6099fd0f62af61e6a85
Author: Henning Noeth <hnoeth@apache.org>
AuthorDate: Wed Feb 14 10:17:13 2018 +0100

    update docker tobago-vm
---
 .../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 5ca3a41..51c2e19 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.0.0",
-          staging: "4.1.0",
+          release: "4.1.0",
+          staging: "",
           snapshot: "4.1.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 9c8bba6..9fe6001 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.0.0
-      - CONTEXT_PATH=demo-4-release
-    volumes:
-      - /opt/docker/artifacts:/opt/docker/artifacts
-  demo-4-staging:
-    build: tomcat
-    environment:
       - TOBAGO_VERSION=4.1.0
-      - STAGING_NUMBER=1128
-      - 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.1.0
+#      - STAGING_NUMBER=1128
+#      - 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
hnoeth@apache.org.

Mime
View raw message