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/05/31 06:05:50 UTC
[myfaces-tobago] branch master updated (c19c520 -> 0ef14fd)
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git.
from c19c520 feat(flexLayout): impl justifyContent
new b287fa9 demo(docker) update to next released versions
new 0ef14fd demo(docker) update to next released versions
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/tobago-vm/docker/apache-proxy/index.html | 8 +--
.../src/main/tobago-vm/docker/docker-compose.yml | 80 ++++++++++------------
2 files changed, 42 insertions(+), 46 deletions(-)
[myfaces-tobago] 01/02: demo(docker) update to next released
versions
Posted by 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
commit b287fa9b6a82ad34bdcdb4686b51d5a47be89be2
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon May 31 08:02:57 2021 +0200
demo(docker) update to next released versions
---
.../main/tobago-vm/docker/apache-proxy/index.html | 11 +--
.../src/main/tobago-vm/docker/docker-compose.yml | 80 ++++++++++------------
2 files changed, 44 insertions(+), 47 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 5d93850..2aabfeb 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
@@ -26,17 +26,18 @@
var versions = [
{
major: "5",
- release: "",
- staging: "5.0.0-alpha-1",
+ release: "5.0.0-alpha-1",
+ staging: "",
snapshot: "5.0.0-SNAPSHOT",
link: "5",
archived: false
},
{
major: "4",
- release: "4.5.3",
- staging: "4.5.4",
- snapshot: "4.5.5-SNAPSHOT",
+ release: "4.5.4",
+ staging: "",
+ snapshot:
+ "4.5.5-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 96c6ee5..167541e 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
@@ -25,11 +25,11 @@ services:
max-size: "1m"
max-file: "5"
links:
-# - demo-5-release
- - demo-5-staging
+ - demo-5-release
+# - demo-5-staging
- demo-5-snapshot
- demo-4-release
- - demo-4-staging
+# - demo-4-staging
- demo-4-snapshot
- demo-3-release
- demo-2-release
@@ -42,49 +42,45 @@ services:
# - demo-1-0-staging
# - demo-1-0-snapshot
depends_on:
-# - demo-5-release
- - demo-5-staging
+ - demo-5-release
+# - demo-5-staging
- demo-5-snapshot
- demo-4-release
- - demo-4-staging
+# - demo-4-staging
- demo-4-snapshot
- demo-3-release
- demo-2-release
# - demo-2-staging
- demo-2-snapshot
- demo-1-5-release
-# - demo-1-5-staging
-# - demo-1-5-snapshot
- demo-1-0-release
-# - demo-1-0-staging
-# - demo-1-0-snapshot
-# demo-5-release:
-# build: tomcat
-# environment:
-# - TOBAGO_VERSION=5.0.0-alpha-1
-# - CONTEXT_PATH=demo-5-release
-# volumes:
-# - /opt/docker/artifacts:/opt/docker/artifacts
-# ports:
-# - "8500:8080"
-# logging:
-# options:
-# max-size: "1m"
-# max-file: "5"
- demo-5-staging:
+ demo-5-release:
build: tomcat
environment:
- TOBAGO_VERSION=5.0.0-alpha-1
- - STAGING_NUMBER=1192
- - CONTEXT_PATH=demo-5-staging
+ - CONTEXT_PATH=demo-5-release
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
ports:
- - "8501:8080"
+ - "8500:8080"
logging:
options:
max-size: "1m"
max-file: "5"
+# demo-5-staging:
+# build: tomcat
+# environment:
+# - TOBAGO_VERSION=5.0.0-alpha-1
+# - STAGING_NUMBER=1192
+# - CONTEXT_PATH=demo-5-staging
+# volumes:
+# - /opt/docker/artifacts:/opt/docker/artifacts
+# ports:
+# - "8501:8080"
+# logging:
+# options:
+# max-size: "1m"
+# max-file: "5"
demo-5-snapshot:
build: tomcat
environment:
@@ -101,7 +97,7 @@ services:
demo-4-release:
build: tomcat
environment:
- - TOBAGO_VERSION=4.5.3
+ - TOBAGO_VERSION=4.5.4
- CONTEXT_PATH=demo-4-release
volumes:
- /opt/docker/artifacts:/opt/docker/artifacts
@@ -111,20 +107,20 @@ services:
options:
max-size: "1m"
max-file: "5"
- demo-4-staging:
- build: tomcat
- environment:
- - TOBAGO_VERSION=4.5.4
- - STAGING_NUMBER=1191
- - CONTEXT_PATH=demo-4-staging
- volumes:
- - /opt/docker/artifacts:/opt/docker/artifacts
- ports:
- - "8401:8080"
- logging:
- options:
- max-size: "1m"
- max-file: "5"
+# demo-4-staging:
+# build: tomcat
+# environment:
+# - TOBAGO_VERSION=4.5.4
+# - STAGING_NUMBER=1191
+# - CONTEXT_PATH=demo-4-staging
+# volumes:
+# - /opt/docker/artifacts:/opt/docker/artifacts
+# ports:
+# - "8401:8080"
+# logging:
+# options:
+# max-size: "1m"
+# max-file: "5"
demo-4-snapshot:
build: tomcat
environment:
[myfaces-tobago] 02/02: demo(docker) update to next released
versions
Posted by 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
commit 0ef14fdd0e99cf1d230284085bca88d1b42f9be3
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Mon May 31 08:05:15 2021 +0200
demo(docker) update to next released versions
---
.../src/main/tobago-vm/docker/apache-proxy/index.html | 3 +--
1 file changed, 1 insertion(+), 2 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 2aabfeb..61b8196 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
@@ -36,8 +36,7 @@
major: "4",
release: "4.5.4",
staging: "",
- snapshot:
- "4.5.5-SNAPSHOT",
+ snapshot: "4.5.5-SNAPSHOT",
link: "4",
archived: false
},