Merge pull request #9 from pmsipilot/fix_8_ownership

Adding trigger in dev_demoinstance launcher to fix ownership

docker-compose.yml

@@ -4,8 +4,9 @@ demoinstance:
         - ./backend/demoinstance/:/opt/demoinstance/backend/demoinstance/
         - ./frontend/:/opt/demoinstance/frontend/
         - ./config/:/etc/demoinstance/
-        - ./ressources/supervisor:/etc/supervisor/conf.d
-        - ./ressources/dev_demoinstance:/usr/local/bin/demoinstance
+        - ./ressources/supervisor_dev:/etc/supervisor/conf.d
+        - ./ressources/dev_demoinstance:/opt/demoinstance/dev_demoinstance
+        - ./ressources/dev_demoinstance.py:/opt/demoinstance/dev_demoinstance.py
     ports:
         - "8080:8080"
     expose:

frontend/dev_gulp

@@ -10,10 +10,6 @@ function finish {
 	cd /opt/demoinstance/frontend
 	chown -R `stat -c "%u:%g" .` .
     fi
-    if [ -d "/opt/demoinstance/backend" ]; then
-	cd /opt/demoinstance/backend
-	chown -R `stat -c "%u:%g" .` .
-    fi
 }
 
 

ressources/dev_demoinstance

@@ -1,9 +1,20 @@
-#!/usr/bin/python
+#!/bin/bash
 
-import sys
+set -o errexit
+set -o pipefail
+set -o nounset
 
-sys.path.insert(1, "/opt/demoinstance/backend/")
 
-from demoinstance.cli import cli_entrypoint
-print "DemoInstance Dev Environment"
-cli_entrypoint()
+function finish {
+    echo "Fixing file permissions: it might take some time"
+    if [ -d "/opt/demoinstance/backend/demoinstance" ]; then
+	cd /opt/demoinstance/backend/demoinstance
+	chown -R `stat -c "%u:%g" .` .
+    fi
+}
+
+
+trap finish EXIT
+
+
+python2 /opt/demoinstance/dev_demoinstance.py $@

ressources/dev_demoinstance.py

@@ -0,0 +1,10 @@
+#!/usr/bin/python
+
+import sys
+
+sys.path.insert(1, "/opt/demoinstance/backend/")
+
+from demoinstance.cli import cli_entrypoint
+print "DemoInstance Dev Environment"
+cli_entrypoint()
+

ressources/supervisor_dev/backend.conf

@@ -0,0 +1,10 @@
+[supervisord]
+nodaemon=true
+
+[program:backend]
+command=bash /opt/demoinstance/dev_demoinstance -c /etc/demoinstance/config.ini
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/fd/2
+stderr_logfile_maxbytes=0
+

ressources/supervisor/dev.conf → ressources/supervisor_dev/frontend.conf

@@ -6,3 +6,9 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/fd/2
 stderr_logfile_maxbytes=0
 
+[program:nginx]
+command=nginx -g "daemon off;"
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/fd/2
+stderr_logfile_maxbytes=0