This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 4_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/4_1_X by this push:
new c876550e2d Docker images: improve shutdown management
c876550e2d is described below
commit c876550e2db27644256a90a2e894b596fb878b9b
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri May 29 16:25:01 2026 +0200
Docker images: improve shutdown management
---
docker/console/src/main/resources/console-docker.properties | 2 ++
docker/console/src/main/resources/startup.sh | 2 +-
docker/core/src/main/resources/core-docker.properties | 2 ++
docker/core/src/main/resources/startup.sh | 2 +-
docker/enduser/src/main/resources/enduser-docker.properties | 2 ++
docker/enduser/src/main/resources/startup.sh | 2 +-
docker/sra/src/main/resources/sra-docker.properties | 2 ++
docker/sra/src/main/resources/startup.sh | 2 +-
docker/wa/src/main/resources/startup.sh | 2 +-
docker/wa/src/main/resources/wa-docker.properties | 2 ++
10 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/docker/console/src/main/resources/console-docker.properties
b/docker/console/src/main/resources/console-docker.properties
index 0ae56628b6..d591cb1ab0 100644
--- a/docker/console/src/main/resources/console-docker.properties
+++ b/docker/console/src/main/resources/console-docker.properties
@@ -23,6 +23,8 @@ service.discovery.address=${SERVICE_DISCOVERY_ADDRESS}
console.anonymousUser=${ANONYMOUS_USER:anonymous}
console.anonymousKey=${ANONYMOUS_KEY:anonymousKey}
+spring.lifecycle.timeout-per-shutdown-phase=30s
+
spring.threads.virtual.enabled=true
logging.config=file:///opt/syncope/conf/log4j2.xml
diff --git a/docker/console/src/main/resources/startup.sh
b/docker/console/src/main/resources/startup.sh
index 229578a90d..9d8a20cf49 100755
--- a/docker/console/src/main/resources/startup.sh
+++ b/docker/console/src/main/resources/startup.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-java $JAVA_OPTS -jar /opt/syncope/lib/syncope-console.jar
+exec java $JAVA_OPTS -jar /opt/syncope/lib/syncope-console.jar
diff --git a/docker/core/src/main/resources/core-docker.properties
b/docker/core/src/main/resources/core-docker.properties
index f32d4e6059..fb6a97f8dc 100644
--- a/docker/core/src/main/resources/core-docker.properties
+++ b/docker/core/src/main/resources/core-docker.properties
@@ -25,6 +25,8 @@ security.anonymousKey=${ANONYMOUS_KEY:anonymousKey}
persistence.remoteCommitProvider=${OPENJPA_REMOTE_COMMIT}
+spring.lifecycle.timeout-per-shutdown-phase=30s
+
spring.threads.virtual.enabled=true
logging.config=file:///opt/syncope/conf/log4j2.xml
diff --git a/docker/core/src/main/resources/startup.sh
b/docker/core/src/main/resources/startup.sh
index 10a74a3e48..3a552db7b0 100755
--- a/docker/core/src/main/resources/startup.sh
+++ b/docker/core/src/main/resources/startup.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-java $JAVA_OPTS -jar /opt/syncope/lib/syncope.jar
+exec java $JAVA_OPTS -jar /opt/syncope/lib/syncope.jar
diff --git a/docker/enduser/src/main/resources/enduser-docker.properties
b/docker/enduser/src/main/resources/enduser-docker.properties
index 99db7974e2..6a9bc92808 100644
--- a/docker/enduser/src/main/resources/enduser-docker.properties
+++ b/docker/enduser/src/main/resources/enduser-docker.properties
@@ -23,6 +23,8 @@ service.discovery.address=${SERVICE_DISCOVERY_ADDRESS}
enduser.anonymousUser=${ANONYMOUS_USER:anonymous}
enduser.anonymousKey=${ANONYMOUS_KEY:anonymousKey}
+spring.lifecycle.timeout-per-shutdown-phase=30s
+
spring.threads.virtual.enabled=true
logging.config=file:///opt/syncope/conf/log4j2.xml
diff --git a/docker/enduser/src/main/resources/startup.sh
b/docker/enduser/src/main/resources/startup.sh
index b09d451c36..79c8e7f447 100755
--- a/docker/enduser/src/main/resources/startup.sh
+++ b/docker/enduser/src/main/resources/startup.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-java $JAVA_OPTS -jar /opt/syncope/lib/syncope-enduser.jar
+exec java $JAVA_OPTS -jar /opt/syncope/lib/syncope-enduser.jar
diff --git a/docker/sra/src/main/resources/sra-docker.properties
b/docker/sra/src/main/resources/sra-docker.properties
index 3d927d4d0e..1c4ed60bc6 100644
--- a/docker/sra/src/main/resources/sra-docker.properties
+++ b/docker/sra/src/main/resources/sra-docker.properties
@@ -23,6 +23,8 @@ service.discovery.address=${SERVICE_DISCOVERY_ADDRESS}
sra.anonymousUser=${ANONYMOUS_USER:anonymous}
sra.anonymousKey=${ANONYMOUS_KEY:anonymousKey}
+spring.lifecycle.timeout-per-shutdown-phase=30s
+
spring.threads.virtual.enabled=true
logging.config=file:///opt/syncope/conf/log4j2.xml
diff --git a/docker/sra/src/main/resources/startup.sh
b/docker/sra/src/main/resources/startup.sh
index 24fd54f691..3f8b9bd533 100755
--- a/docker/sra/src/main/resources/startup.sh
+++ b/docker/sra/src/main/resources/startup.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-java $JAVA_OPTS -jar /opt/syncope/lib/syncope-sra.jar
+exec java $JAVA_OPTS -jar /opt/syncope/lib/syncope-sra.jar
diff --git a/docker/wa/src/main/resources/startup.sh
b/docker/wa/src/main/resources/startup.sh
index 35b0d8dab1..68f7789dd9 100755
--- a/docker/wa/src/main/resources/startup.sh
+++ b/docker/wa/src/main/resources/startup.sh
@@ -17,4 +17,4 @@
# specific language governing permissions and limitations
# under the License.
-java $JAVA_OPTS -jar /opt/syncope/lib/syncope-wa.jar
+exec java $JAVA_OPTS -jar /opt/syncope/lib/syncope-wa.jar
diff --git a/docker/wa/src/main/resources/wa-docker.properties
b/docker/wa/src/main/resources/wa-docker.properties
index cf0a82a36f..4c91c4f52e 100644
--- a/docker/wa/src/main/resources/wa-docker.properties
+++ b/docker/wa/src/main/resources/wa-docker.properties
@@ -28,6 +28,8 @@ wa.anonymousKey=${ANONYMOUS_KEY:anonymousKey}
spring.security.user.name=${ANONYMOUS_USER:anonymous}
spring.security.user.password=${ANONYMOUS_KEY:anonymousKey}
+spring.lifecycle.timeout-per-shutdown-phase=30s
+
spring.threads.virtual.enabled=true
logging.config=file:///opt/syncope/conf/log4j2.xml
