This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 4cb8ea1 Docker: Using Zulu instead of Debian OpenJDK
4cb8ea1 is described below
commit 4cb8ea18cdc0c4916e3e55119999a2458d14a9cc
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri Mar 8 13:31:51 2019 +0100
Docker: Using Zulu instead of Debian OpenJDK
---
.../src/main/resources/quartz/tables_postgres.sql | 22 +++++++++++-----------
docker/console/src/main/resources/build.sh | 12 ++++++++++--
docker/core/src/main/resources/build.sh | 12 ++++++++++--
docker/enduser/src/main/resources/build.sh | 12 ++++++++++--
.../resources/docker-compose/docker-compose-ha.yml | 8 ++++----
.../docker-compose/docker-compose-mariadb.yml | 6 +++---
.../docker-compose/docker-compose-mssql.yml | 6 +++---
.../docker-compose/docker-compose-mysql.yml | 6 +++---
.../docker-compose/docker-compose-postgresql.yml | 6 +++---
9 files changed, 57 insertions(+), 33 deletions(-)
diff --git
a/core/provisioning-java/src/main/resources/quartz/tables_postgres.sql
b/core/provisioning-java/src/main/resources/quartz/tables_postgres.sql
index 9b7800f..634ade5 100644
--- a/core/provisioning-java/src/main/resources/quartz/tables_postgres.sql
+++ b/core/provisioning-java/src/main/resources/quartz/tables_postgres.sql
@@ -20,17 +20,17 @@
-- In your Quartz properties file, you'll need to set
-- org.quartz.jobStore.driverDelegateClass =
org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
-drop table qrtz_fired_triggers;
-DROP TABLE QRTZ_PAUSED_TRIGGER_GRPS;
-DROP TABLE QRTZ_SCHEDULER_STATE;
-DROP TABLE QRTZ_LOCKS;
-drop table qrtz_simple_triggers;
-drop table qrtz_cron_triggers;
-drop table qrtz_simprop_triggers;
-DROP TABLE QRTZ_BLOB_TRIGGERS;
-drop table qrtz_triggers;
-drop table qrtz_job_details;
-drop table qrtz_calendars;
+DROP TABLE IF EXISTS qrtz_fired_triggers;
+DROP TABLE IF EXISTS qrtz_paused_trigger_grps;
+DROP TABLE IF EXISTS qrtz_scheduler_state;
+DROP TABLE IF EXISTS qrtz_locks;
+DROP TABLE IF EXISTS qrtz_simple_triggers;
+DROP TABLE IF EXISTS qrtz_cron_triggers;
+DROP TABLE IF EXISTS qrtz_simprop_triggers;
+DROP TABLE IF EXISTS qrtz_blob_triggers;
+DROP TABLE IF EXISTS qrtz_triggers;
+DROP TABLE IF EXISTS qrtz_job_details;
+DROP TABLE IF EXISTS qrtz_calendars;
CREATE TABLE qrtz_job_details
(
diff --git a/docker/console/src/main/resources/build.sh
b/docker/console/src/main/resources/build.sh
index a164395..ca4b39f 100755
--- a/docker/console/src/main/resources/build.sh
+++ b/docker/console/src/main/resources/build.sh
@@ -32,12 +32,20 @@ export DEBCONF_TERSE true
mkdir -p /usr/share/man/man1/
######
+# Additional APT repositories
+######
+apt-get -q update && apt-get -q install -y wget
+
+wget -q -O - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | tee
/etc/apt/trusted.gpg.d/zulu.asc
+echo 'deb http://repos.azulsystems.com/debian stable main' >
/etc/apt/sources.list.d/zulu.list
+
+######
# Install packages
######
apt-get -q update \
&& apt-get -q install -y \
xtail \
- openjdk-8-jdk \
+ zulu-8 \
tomcat8 \
libservlet3.1-java \
&& apt-get clean
@@ -55,4 +63,4 @@ echo "JAVA_OPTS=\"\${JAVA_OPTS} -Dfile.encoding=UTF-8 -server
\
-XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC \
-Djava.security.egd=file:/dev/./urandom\"" >> /etc/default/tomcat8
-echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> /etc/default/tomcat8
+echo "JAVA_HOME=/usr/lib/jvm/zulu-8-amd64" >> /etc/default/tomcat8
diff --git a/docker/core/src/main/resources/build.sh
b/docker/core/src/main/resources/build.sh
index d311e47..cc36f5e 100755
--- a/docker/core/src/main/resources/build.sh
+++ b/docker/core/src/main/resources/build.sh
@@ -32,12 +32,20 @@ export DEBCONF_TERSE true
mkdir -p /usr/share/man/man1/
######
+# Additional APT repositories
+######
+apt-get -q update && apt-get -q install -y wget
+
+wget -q -O - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | tee
/etc/apt/trusted.gpg.d/zulu.asc
+echo 'deb http://repos.azulsystems.com/debian stable main' >
/etc/apt/sources.list.d/zulu.list
+
+######
# Install packages
######
apt-get -q update \
&& apt-get -q install -y \
xtail \
- openjdk-8-jdk \
+ zulu-8 \
tomcat8 \
libservlet3.1-java \
&& apt-get clean
@@ -57,4 +65,4 @@ echo "JAVA_OPTS=\"\${JAVA_OPTS} -Dfile.encoding=UTF-8 -server
\
-XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC \
-Djava.security.egd=file:/dev/./urandom\"" >> /etc/default/tomcat8
-echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> /etc/default/tomcat8
+echo "JAVA_HOME=/usr/lib/jvm/zulu-8-amd64" >> /etc/default/tomcat8
diff --git a/docker/enduser/src/main/resources/build.sh
b/docker/enduser/src/main/resources/build.sh
index a164395..ca4b39f 100755
--- a/docker/enduser/src/main/resources/build.sh
+++ b/docker/enduser/src/main/resources/build.sh
@@ -32,12 +32,20 @@ export DEBCONF_TERSE true
mkdir -p /usr/share/man/man1/
######
+# Additional APT repositories
+######
+apt-get -q update && apt-get -q install -y wget
+
+wget -q -O - http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems | tee
/etc/apt/trusted.gpg.d/zulu.asc
+echo 'deb http://repos.azulsystems.com/debian stable main' >
/etc/apt/sources.list.d/zulu.list
+
+######
# Install packages
######
apt-get -q update \
&& apt-get -q install -y \
xtail \
- openjdk-8-jdk \
+ zulu-8 \
tomcat8 \
libservlet3.1-java \
&& apt-get clean
@@ -55,4 +63,4 @@ echo "JAVA_OPTS=\"\${JAVA_OPTS} -Dfile.encoding=UTF-8 -server
\
-XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC \
-Djava.security.egd=file:/dev/./urandom\"" >> /etc/default/tomcat8
-echo "JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> /etc/default/tomcat8
+echo "JAVA_HOME=/usr/lib/jvm/zulu-8-amd64" >> /etc/default/tomcat8
diff --git a/docker/src/main/resources/docker-compose/docker-compose-ha.yml
b/docker/src/main/resources/docker-compose/docker-compose-ha.yml
index 0eb26f5..71ef1da 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-ha.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-ha.yml
@@ -38,7 +38,7 @@ services:
syncope1:
depends_on:
- db
- image: apache/syncope:${syncope.version}
+ image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
restart: always
@@ -54,7 +54,7 @@ services:
syncope2:
depends_on:
- db
- image: apache/syncope:${syncope.version}
+ image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18081:8080"
restart: always
@@ -70,7 +70,7 @@ services:
syncope-console:
depends_on:
- syncope1
- image: apache/syncope-console:${syncope.version}
+ image: apache/syncope-console:${SYNCOPE_VERSION}
ports:
- "28080:8080"
restart: always
@@ -82,7 +82,7 @@ services:
syncope-enduser:
depends_on:
- syncope1
- image: apache/syncope-enduser:${syncope.version}
+ image: apache/syncope-enduser:${SYNCOPE_VERSION}
ports:
- "38080:8080"
restart: always
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
index 65851bb..d979049 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mariadb.yml
@@ -32,7 +32,7 @@ services:
syncope:
depends_on:
- db
- image: apache/syncope:${syncope.version}
+ image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
restart: always
@@ -48,7 +48,7 @@ services:
syncope-console:
depends_on:
- syncope
- image: apache/syncope-console:${syncope.version}
+ image: apache/syncope-console:${SYNCOPE_VERSION}
ports:
- "28080:8080"
restart: always
@@ -60,7 +60,7 @@ services:
syncope-enduser:
depends_on:
- syncope
- image: apache/syncope-enduser:${syncope.version}
+ image: apache/syncope-enduser:${SYNCOPE_VERSION}
ports:
- "38080:8080"
restart: always
diff --git a/docker/src/main/resources/docker-compose/docker-compose-mssql.yml
b/docker/src/main/resources/docker-compose/docker-compose-mssql.yml
index 462f749..32a9300 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mssql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mssql.yml
@@ -33,7 +33,7 @@ services:
syncope:
depends_on:
- db
- image: apache/syncope:${syncope.version}
+ image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
restart: always
@@ -50,7 +50,7 @@ services:
syncope-console:
depends_on:
- syncope
- image: apache/syncope-console:${syncope.version}
+ image: apache/syncope-console:${SYNCOPE_VERSION}
ports:
- "28080:8080"
restart: always
@@ -62,7 +62,7 @@ services:
syncope-enduser:
depends_on:
- syncope
- image: apache/syncope-enduser:${syncope.version}
+ image: apache/syncope-enduser:${SYNCOPE_VERSION}
ports:
- "38080:8080"
restart: always
diff --git a/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
b/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
index d2af8c0..c7ecd2b 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-mysql.yml
@@ -31,7 +31,7 @@ services:
syncope:
depends_on:
- db
- image: apache/syncope:${syncope.version}
+ image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
restart: always
@@ -47,7 +47,7 @@ services:
syncope-console:
depends_on:
- syncope
- image: apache/syncope-console:${syncope.version}
+ image: apache/syncope-console:${SYNCOPE_VERSION}
ports:
- "28080:8080"
restart: always
@@ -59,7 +59,7 @@ services:
syncope-enduser:
depends_on:
- syncope
- image: apache/syncope-enduser:${syncope.version}
+ image: apache/syncope-enduser:${SYNCOPE_VERSION}
ports:
- "38080:8080"
restart: always
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
index 0c42ede..1bb5495 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
@@ -37,7 +37,7 @@ services:
syncope:
depends_on:
- db
- image: apache/syncope:${syncope.version}
+ image: apache/syncope:${SYNCOPE_VERSION}
ports:
- "18080:8080"
restart: always
@@ -53,7 +53,7 @@ services:
syncope-console:
depends_on:
- syncope
- image: apache/syncope-console:${syncope.version}
+ image: apache/syncope-console:${SYNCOPE_VERSION}
ports:
- "28080:8080"
restart: always
@@ -65,7 +65,7 @@ services:
syncope-enduser:
depends_on:
- syncope
- image: apache/syncope-enduser:${syncope.version}
+ image: apache/syncope-enduser:${SYNCOPE_VERSION}
ports:
- "38080:8080"
restart: always
