You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/07/21 13:15:05 UTC
[1/3] syncope git commit: [SYNCOPE-1341] Adding DOMAIN variable for
the Enduser image
Repository: syncope
Updated Branches:
refs/heads/2_0_X af9b93169 -> 4ff68ce56
refs/heads/2_1_X d8773a4e7 -> f38f1cbe0
refs/heads/master e6cd20ed3 -> d478c0a5f
[SYNCOPE-1341] Adding DOMAIN variable for the Enduser image
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f38f1cbe
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f38f1cbe
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f38f1cbe
Branch: refs/heads/2_1_X
Commit: f38f1cbe0e2c73bf4c5466af75a01b15a72e8629
Parents: d8773a4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Sat Jul 21 15:13:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Sat Jul 21 15:14:41 2018 +0200
----------------------------------------------------------------------
docker/enduser/src/main/resources/enduser.properties.template | 2 +-
docker/enduser/src/main/resources/startup.sh | 1 +
docker/src/main/resources/docker-compose-ha.yml | 1 +
docker/src/main/resources/docker-compose-mariadb.yml | 1 +
docker/src/main/resources/docker-compose-mssql.yml | 1 +
docker/src/main/resources/docker-compose-mysql.yml | 1 +
docker/src/main/resources/docker-compose-postgresql.yml | 1 +
src/main/asciidoc/getting-started/obtain.adoc | 4 +++-
8 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/docker/enduser/src/main/resources/enduser.properties.template
----------------------------------------------------------------------
diff --git a/docker/enduser/src/main/resources/enduser.properties.template b/docker/enduser/src/main/resources/enduser.properties.template
index 8f0547a..8ce17e9 100644
--- a/docker/enduser/src/main/resources/enduser.properties.template
+++ b/docker/enduser/src/main/resources/enduser.properties.template
@@ -16,7 +16,7 @@
# under the License.
enduser.directory=/etc/apache-syncope
-domain=Master
+domain=${DOMAIN}
anonymousUser=${anonymousUser}
anonymousKey=${anonymousKey}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/docker/enduser/src/main/resources/startup.sh
----------------------------------------------------------------------
diff --git a/docker/enduser/src/main/resources/startup.sh b/docker/enduser/src/main/resources/startup.sh
index fa2b5f3..6838fbd 100755
--- a/docker/enduser/src/main/resources/startup.sh
+++ b/docker/enduser/src/main/resources/startup.sh
@@ -20,6 +20,7 @@
cd /etc/apache-syncope
sed "s/\${CORE_SCHEME}/$CORE_SCHEME/" enduser.properties.template |
+sed "s/\${DOMAIN}/$DOMAIN/" enduser.properties.template |
sed "s/\${CORE_HOST}/$CORE_HOST/" | sed "s/\${CORE_PORT}/$CORE_PORT/" > enduser.properties
sed "s/\${CORE_SCHEME}/$CORE_SCHEME/" oidcclient-agent.properties.template |
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/docker/src/main/resources/docker-compose-ha.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-ha.yml b/docker/src/main/resources/docker-compose-ha.yml
index c97deab..0eb26f5 100644
--- a/docker/src/main/resources/docker-compose-ha.yml
+++ b/docker/src/main/resources/docker-compose-ha.yml
@@ -90,3 +90,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope1
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/docker/src/main/resources/docker-compose-mariadb.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mariadb.yml b/docker/src/main/resources/docker-compose-mariadb.yml
index 7e78637..65851bb 100644
--- a/docker/src/main/resources/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose-mariadb.yml
@@ -68,3 +68,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/docker/src/main/resources/docker-compose-mssql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mssql.yml b/docker/src/main/resources/docker-compose-mssql.yml
index 592192a..462f749 100644
--- a/docker/src/main/resources/docker-compose-mssql.yml
+++ b/docker/src/main/resources/docker-compose-mssql.yml
@@ -70,3 +70,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/docker/src/main/resources/docker-compose-mysql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mysql.yml b/docker/src/main/resources/docker-compose-mysql.yml
index ed29be5..d2af8c0 100644
--- a/docker/src/main/resources/docker-compose-mysql.yml
+++ b/docker/src/main/resources/docker-compose-mysql.yml
@@ -67,3 +67,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/docker/src/main/resources/docker-compose-postgresql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-postgresql.yml b/docker/src/main/resources/docker-compose-postgresql.yml
index e7abdfe..862a051 100644
--- a/docker/src/main/resources/docker-compose-postgresql.yml
+++ b/docker/src/main/resources/docker-compose-postgresql.yml
@@ -73,3 +73,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/f38f1cbe/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index f02fbf4..d57133a 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -339,6 +339,7 @@ Environment variables:
* `CORE_SCHEME`: URL scheme to connect to Syncope Core; valid values are `http` or `https`
* `CORE_HOST`: host name or IP address to connect to Syncope Core
* `CORE_PORT`: port number to connect to Syncope Core
+* `DOMAIN`: Syncope Core's domain to work with
==== Docker Compose samples
@@ -413,11 +414,12 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
----
<1> Database container for usage as internal storage, based on PostgreSQL 10.3
<2> Apache Syncope Core, single instance, port `18080` exposed
<3> Apache Syncope Admin UI, port `28080` exposed
-<4> Apache Syncope Enduser UI, port `38080` exposed
+<4> Apache Syncope Enduser UI, port `38080` exposed, working with `Master` domain
====
=== Maven Project
[3/3] syncope git commit: [SYNCOPE-1341] Adding DOMAIN variable for
the Enduser image
Posted by il...@apache.org.
[SYNCOPE-1341] Adding DOMAIN variable for the Enduser image
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d478c0a5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d478c0a5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d478c0a5
Branch: refs/heads/master
Commit: d478c0a5fd5b7ee34ddfe2c19c4b8eb6cdbf4899
Parents: e6cd20e
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Sat Jul 21 15:13:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Sat Jul 21 15:14:55 2018 +0200
----------------------------------------------------------------------
docker/enduser/src/main/resources/enduser.properties.template | 2 +-
docker/enduser/src/main/resources/startup.sh | 1 +
docker/src/main/resources/docker-compose-ha.yml | 1 +
docker/src/main/resources/docker-compose-mariadb.yml | 1 +
docker/src/main/resources/docker-compose-mssql.yml | 1 +
docker/src/main/resources/docker-compose-mysql.yml | 1 +
docker/src/main/resources/docker-compose-postgresql.yml | 1 +
src/main/asciidoc/getting-started/obtain.adoc | 4 +++-
8 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/docker/enduser/src/main/resources/enduser.properties.template
----------------------------------------------------------------------
diff --git a/docker/enduser/src/main/resources/enduser.properties.template b/docker/enduser/src/main/resources/enduser.properties.template
index 8f0547a..8ce17e9 100644
--- a/docker/enduser/src/main/resources/enduser.properties.template
+++ b/docker/enduser/src/main/resources/enduser.properties.template
@@ -16,7 +16,7 @@
# under the License.
enduser.directory=/etc/apache-syncope
-domain=Master
+domain=${DOMAIN}
anonymousUser=${anonymousUser}
anonymousKey=${anonymousKey}
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/docker/enduser/src/main/resources/startup.sh
----------------------------------------------------------------------
diff --git a/docker/enduser/src/main/resources/startup.sh b/docker/enduser/src/main/resources/startup.sh
index fa2b5f3..6838fbd 100755
--- a/docker/enduser/src/main/resources/startup.sh
+++ b/docker/enduser/src/main/resources/startup.sh
@@ -20,6 +20,7 @@
cd /etc/apache-syncope
sed "s/\${CORE_SCHEME}/$CORE_SCHEME/" enduser.properties.template |
+sed "s/\${DOMAIN}/$DOMAIN/" enduser.properties.template |
sed "s/\${CORE_HOST}/$CORE_HOST/" | sed "s/\${CORE_PORT}/$CORE_PORT/" > enduser.properties
sed "s/\${CORE_SCHEME}/$CORE_SCHEME/" oidcclient-agent.properties.template |
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/docker/src/main/resources/docker-compose-ha.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-ha.yml b/docker/src/main/resources/docker-compose-ha.yml
index c97deab..0eb26f5 100644
--- a/docker/src/main/resources/docker-compose-ha.yml
+++ b/docker/src/main/resources/docker-compose-ha.yml
@@ -90,3 +90,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope1
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/docker/src/main/resources/docker-compose-mariadb.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mariadb.yml b/docker/src/main/resources/docker-compose-mariadb.yml
index 7e78637..65851bb 100644
--- a/docker/src/main/resources/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose-mariadb.yml
@@ -68,3 +68,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/docker/src/main/resources/docker-compose-mssql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mssql.yml b/docker/src/main/resources/docker-compose-mssql.yml
index 592192a..462f749 100644
--- a/docker/src/main/resources/docker-compose-mssql.yml
+++ b/docker/src/main/resources/docker-compose-mssql.yml
@@ -70,3 +70,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/docker/src/main/resources/docker-compose-mysql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mysql.yml b/docker/src/main/resources/docker-compose-mysql.yml
index ed29be5..d2af8c0 100644
--- a/docker/src/main/resources/docker-compose-mysql.yml
+++ b/docker/src/main/resources/docker-compose-mysql.yml
@@ -67,3 +67,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/docker/src/main/resources/docker-compose-postgresql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-postgresql.yml b/docker/src/main/resources/docker-compose-postgresql.yml
index e7abdfe..862a051 100644
--- a/docker/src/main/resources/docker-compose-postgresql.yml
+++ b/docker/src/main/resources/docker-compose-postgresql.yml
@@ -73,3 +73,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/d478c0a5/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index 3c7df2d..e058d5e 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -339,6 +339,7 @@ Environment variables:
* `CORE_SCHEME`: URL scheme to connect to Syncope Core; valid values are `http` or `https`
* `CORE_HOST`: host name or IP address to connect to Syncope Core
* `CORE_PORT`: port number to connect to Syncope Core
+* `DOMAIN`: Syncope Core's domain to work with
==== Docker Compose samples
@@ -413,11 +414,12 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
----
<1> Database container for usage as internal storage, based on PostgreSQL 10.3
<2> Apache Syncope Core, single instance, port `18080` exposed
<3> Apache Syncope Admin UI, port `28080` exposed
-<4> Apache Syncope Enduser UI, port `38080` exposed
+<4> Apache Syncope Enduser UI, port `38080` exposed, working with `Master` domain
====
=== Maven Project
[2/3] syncope git commit: [SYNCOPE-1341] Adding DOMAIN variable for
the Enduser image
Posted by il...@apache.org.
[SYNCOPE-1341] Adding DOMAIN variable for the Enduser image
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4ff68ce5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4ff68ce5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4ff68ce5
Branch: refs/heads/2_0_X
Commit: 4ff68ce563c8832cdb7abcab10426836923ee28f
Parents: af9b931
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Sat Jul 21 15:13:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Sat Jul 21 15:14:49 2018 +0200
----------------------------------------------------------------------
docker/enduser/src/main/resources/enduser.properties.template | 2 +-
docker/enduser/src/main/resources/startup.sh | 1 +
docker/src/main/resources/docker-compose-ha.yml | 1 +
docker/src/main/resources/docker-compose-mariadb.yml | 1 +
docker/src/main/resources/docker-compose-mssql.yml | 1 +
docker/src/main/resources/docker-compose-mysql.yml | 1 +
docker/src/main/resources/docker-compose-postgresql.yml | 1 +
src/main/asciidoc/getting-started/obtain.adoc | 4 +++-
8 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/docker/enduser/src/main/resources/enduser.properties.template
----------------------------------------------------------------------
diff --git a/docker/enduser/src/main/resources/enduser.properties.template b/docker/enduser/src/main/resources/enduser.properties.template
index 8f0547a..8ce17e9 100644
--- a/docker/enduser/src/main/resources/enduser.properties.template
+++ b/docker/enduser/src/main/resources/enduser.properties.template
@@ -16,7 +16,7 @@
# under the License.
enduser.directory=/etc/apache-syncope
-domain=Master
+domain=${DOMAIN}
anonymousUser=${anonymousUser}
anonymousKey=${anonymousKey}
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/docker/enduser/src/main/resources/startup.sh
----------------------------------------------------------------------
diff --git a/docker/enduser/src/main/resources/startup.sh b/docker/enduser/src/main/resources/startup.sh
index fa2b5f3..6838fbd 100755
--- a/docker/enduser/src/main/resources/startup.sh
+++ b/docker/enduser/src/main/resources/startup.sh
@@ -20,6 +20,7 @@
cd /etc/apache-syncope
sed "s/\${CORE_SCHEME}/$CORE_SCHEME/" enduser.properties.template |
+sed "s/\${DOMAIN}/$DOMAIN/" enduser.properties.template |
sed "s/\${CORE_HOST}/$CORE_HOST/" | sed "s/\${CORE_PORT}/$CORE_PORT/" > enduser.properties
sed "s/\${CORE_SCHEME}/$CORE_SCHEME/" oidcclient-agent.properties.template |
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/docker/src/main/resources/docker-compose-ha.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-ha.yml b/docker/src/main/resources/docker-compose-ha.yml
index c97deab..0eb26f5 100644
--- a/docker/src/main/resources/docker-compose-ha.yml
+++ b/docker/src/main/resources/docker-compose-ha.yml
@@ -90,3 +90,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope1
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/docker/src/main/resources/docker-compose-mariadb.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mariadb.yml b/docker/src/main/resources/docker-compose-mariadb.yml
index 7e78637..65851bb 100644
--- a/docker/src/main/resources/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose-mariadb.yml
@@ -68,3 +68,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/docker/src/main/resources/docker-compose-mssql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mssql.yml b/docker/src/main/resources/docker-compose-mssql.yml
index 592192a..462f749 100644
--- a/docker/src/main/resources/docker-compose-mssql.yml
+++ b/docker/src/main/resources/docker-compose-mssql.yml
@@ -70,3 +70,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/docker/src/main/resources/docker-compose-mysql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-mysql.yml b/docker/src/main/resources/docker-compose-mysql.yml
index ed29be5..d2af8c0 100644
--- a/docker/src/main/resources/docker-compose-mysql.yml
+++ b/docker/src/main/resources/docker-compose-mysql.yml
@@ -67,3 +67,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/docker/src/main/resources/docker-compose-postgresql.yml
----------------------------------------------------------------------
diff --git a/docker/src/main/resources/docker-compose-postgresql.yml b/docker/src/main/resources/docker-compose-postgresql.yml
index e7abdfe..862a051 100644
--- a/docker/src/main/resources/docker-compose-postgresql.yml
+++ b/docker/src/main/resources/docker-compose-postgresql.yml
@@ -73,3 +73,4 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
http://git-wip-us.apache.org/repos/asf/syncope/blob/4ff68ce5/src/main/asciidoc/getting-started/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/getting-started/obtain.adoc b/src/main/asciidoc/getting-started/obtain.adoc
index c2ae2b6..9578cf8 100644
--- a/src/main/asciidoc/getting-started/obtain.adoc
+++ b/src/main/asciidoc/getting-started/obtain.adoc
@@ -348,6 +348,7 @@ Environment variables:
* `CORE_SCHEME`: URL scheme to connect to Syncope Core; valid values are `http` or `https`
* `CORE_HOST`: host name or IP address to connect to Syncope Core
* `CORE_PORT`: port number to connect to Syncope Core
+* `DOMAIN`: Syncope Core's domain to work with
==== Docker Compose samples
@@ -422,11 +423,12 @@ services:
CORE_SCHEME: http
CORE_HOST: syncope
CORE_PORT: 8080
+ DOMAIN: Master
----
<1> Database container for usage as internal storage, based on PostgreSQL 10.3
<2> Apache Syncope Core, single instance, port `18080` exposed
<3> Apache Syncope Admin UI, port `28080` exposed
-<4> Apache Syncope Enduser UI, port `38080` exposed
+<4> Apache Syncope Enduser UI, port `38080` exposed, working with `Master` domain
====
=== Maven Project