From 0a859a532830a0ae055ec8391b40f1eb0c31dec0 Mon Sep 17 00:00:00 2001
From: Bengt Giger <bgiger@ethz.ch>
Date: Sat, 19 Dec 2020 19:34:56 +0100
Subject: [PATCH] Move start procedure to extra script

---
 .../distributed/sebuniversal.Dockerfile       | 26 +++----------------
 docker/testing/distributed/start-sebserver.sh | 21 +++++++++++++++
 2 files changed, 25 insertions(+), 22 deletions(-)
 create mode 100644 docker/testing/distributed/start-sebserver.sh

diff --git a/docker/testing/distributed/sebuniversal.Dockerfile b/docker/testing/distributed/sebuniversal.Dockerfile
index d8f68cae..f202ce68 100644
--- a/docker/testing/distributed/sebuniversal.Dockerfile
+++ b/docker/testing/distributed/sebuniversal.Dockerfile
@@ -9,35 +9,17 @@ ENV DB_HOST=sebserver-mariadb
 # ENV DB_DATABASE=SEBServer
 ENV DB_PORT=3306
 
+RUN mkdir -p /sebserver/config/spring
 RUN groupadd --system spring && useradd --system --gid spring spring
 USER spring:spring
 
 # Test if existing files prohibit mounting of Kubernetes ConfigMaps
 # COPY docker/testing/distributed/webservice/config/ /sebserver/config/
-COPY  seb-server.jar /sebserver/seb-server.jar
+COPY  seb-server.jar start-sebserver /sebserver/
+RUN chmod 755 /sebserver/start-sebserver.sh
 
 WORKDIR /sebserver
 
-CMD if [ "${SEBSERVER_MODE}" == "gui" ]; then exec java \
-    -Xms64M \
-    -Xmx1G \
-    -jar "seb-server.jar" \
-    --spring.profiles.active=gui,prod,prod-gui \
-    --spring.config.location=file:/sebserver/config/spring/,classpath:/config/ \
-    --sebserver.password="${SECRET}" ; \
-    else \
-    exec java \
-    -Xms64M \
-    -Xmx1G \
-    -jar "${SEBSERVER_JAR}" \
-    --spring.profiles.active=ws,prod,prod-ws \
-    --spring.config.location=file:/sebserver/config/spring/,classpath:/config/ \
-    --datastore.mariadb.server.address="${DB_HOST}" \
-    --datastore.mariadb.server.port="${DB_PORT}" \
-    --spring.datasource.username="${DB_USER}" \
-    --sebserver.mariadb.password="${DB_PASSWORD}" \
-    --sebserver.password="${SECRET}" ; \
-    fi;
+CMD /sebserver/start-sebserver.sh
 
 EXPOSE 8080
-    
\ No newline at end of file
diff --git a/docker/testing/distributed/start-sebserver.sh b/docker/testing/distributed/start-sebserver.sh
new file mode 100644
index 00000000..24e6dcc6
--- /dev/null
+++ b/docker/testing/distributed/start-sebserver.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+if [ "${SEBSERVER_MODE}" == "gui" ]; then exec java \
+    -Xms64M \
+    -Xmx1G \
+    -jar "seb-server.jar" \
+    --spring.profiles.active=gui,prod,prod-gui \
+    --spring.config.location=file:/sebserver/config/spring/,classpath:/config/ \
+    --sebserver.password="${SECRET}" ; \
+    else \
+    exec java \
+    -Xms64M \
+    -Xmx1G \
+    -jar "${SEBSERVER_JAR}" \
+    --spring.profiles.active=ws,prod,prod-ws \
+    --spring.config.location=file:/sebserver/config/spring/,classpath:/config/ \
+    --datastore.mariadb.server.address="${DB_HOST}" \
+    --datastore.mariadb.server.port="${DB_PORT}" \
+    --spring.datasource.username="${DB_USER}" \
+    --sebserver.mariadb.password="${DB_PASSWORD}" \
+    --sebserver.password="${SECRET}" ; \
+fi;
\ No newline at end of file