avoid starting processe in fg because of debug mode

Author: odelaere

docker-dev.cfg

@@ -15,6 +15,7 @@ zeo-address = zeo:8100
 
 [instance]
 <= instance1
+debug-mode = off
 blob-storage = /data/blobstorage
 shared-blob = on
 zope-conf-additional =

docker/docker-compose.yml

@@ -18,7 +18,7 @@ services:
     mem_reservation: 150M
     mem_swappiness: 0
   zeo:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: zeoserver
     environment:
       - MOUNTPOINT=demo
@@ -36,7 +36,7 @@ services:
 #    restart:
 #      unless-stopped
   instance1:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: instance
     ports:
       - "20081:8081"
@@ -63,7 +63,7 @@ services:
     labels:
       SERVICE_NAME: "instance1"
   instance2:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: instance
     ports:
       - "20082:8081"
@@ -90,7 +90,7 @@ services:
     labels:
       SERVICE_NAME: "instance2"
   instance3:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: instance
     ports:
       - "20083:8081"
@@ -119,7 +119,7 @@ services:
 #    restart:
 #      unless-stopped
   worker-cron:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: instance-cron
     ports:
       - "8087:8087"
@@ -145,10 +145,10 @@ services:
       test: "curl -f localhost:8087/$$PLONE_PATH/@@ok"
     labels:
       SERVICE_NAME: "worker-cron"
-    restart:
-      unless-stopped
+#    restart:
+#      unless-stopped
   worker-async:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: instance-async
     networks:
       - internal
@@ -174,7 +174,7 @@ services:
 #    restart:
 #      unless-stopped
   worker-amqp:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: instance-amqp
     ports:
       - "20085:8286"
@@ -210,7 +210,7 @@ services:
 #    restart:
 #      unless-stopped
   maintenance:
-    image: imiobe/iadelib:latest
+    image: imiobe/iadelib:4.2.10
     command: maintenance
     ports:
       - "20089:8080"

docker/docker-entrypoint.sh

@@ -27,7 +27,29 @@ function wait_for_cron() {
     echo "received response  $response"
   done
 }
+function start() {
+  echo "Starting $1"
+  cmd="bin/$1"
+  _stop() {
+    echo "Forcing to stop"
+    $cmd stop
+    case "$cmd" in
+    "bin/zeoserver")
+      if [[ -f /data/filestorage/Data.fs.lock ]]; then
+        kill -TERM "$(cat /data/filestorage/Data.fs.lock)" 2>/dev/null
+      fi
+      ;;
+    *)
+      ;;
+    esac
+	}
 
+	trap _stop SIGTERM SIGINT
+	$cmd start
+	# ensure file xists otherwise logtail returns 1
+	touch "/data/log/$HOSTNAME.log"
+	exec "$cmd" "logtail"
+}
 
 setup "$1"
 
@@ -41,7 +63,6 @@ case "$1" in
   exec "bash"
   ;;
 *)
-  echo "Starting $1"
-  exec "bin/python" "bin/$1" "fg"
+  start "$1"
   ;;
 esac