From 1aadce09c9ed099058c9da70f9792dca1b45b03a Mon Sep 17 00:00:00 2001
From: Yves Lavoie <ylavoie@yveslavoie.com>
Date: Mon, 25 Sep 2017 20:37:00 -0400
Subject: [PATCH] Use variables.env

---
 .env               |  1 +
 docker-compose.yml | 13 +++++--------
 start.sh           | 20 ++++++++++++--------
 variables.env      |  2 +-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/.env b/.env
index 8793fa2..fd26618 100644
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
 TAG=xenial
+DEVELOPMENT=1
diff --git a/docker-compose.yml b/docker-compose.yml
index cf53cc8..c9a4168 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,13 +21,12 @@ services:
     environment:
       - POSTGRES_PASSWORD=test
 #      - PGDATA=/tmp/docker-postgresql
-#    volumes:
+    volumes:
+      - /tmp:/tmp
 #      # We'll mount the 'pgdata' volume into the location Postgres stores it's data:
 #      - pgdata:/var/lib/postgresql/data
 
   lsmb:
-    env_file:
-      - variables.env
     image: "ylavoie/ledgersmb:${TAG}"
     container_name: lsmb
     networks:
@@ -35,18 +34,16 @@ services:
       - lsmb_internal
     build:
       context: ./ledgersmb-docker
+    env_file:
+      - ledgersmb-docker/variables.env
     #dns_opt: # V2 only ;-(
-    #  - ndots:1
-    environment:
-      - PGHOST=postgres
-      - DEVELOPMENT=1
+    #  - ndots:1 # Patched in start.sh
     volumes:
       - /tmp:/tmp
       - ./ledgersmb-docker:/srv/ledgersmb-docker
       - ./LedgerSMB:/srv/ledgersmb:rw
     ports:
       - 5001:5001
-      - 8080:8080
     depends_on:
       - postgres
 
diff --git a/start.sh b/start.sh
index 9ca72a7..e9c1008 100755
--- a/start.sh
+++ b/start.sh
@@ -26,13 +26,17 @@ sudo chmod 666 /etc/resolv.conf
 echo "options ndots:1" >>/etc/resolv.conf
 sudo chmod 644 /etc/resolv.conf
 
-# start ledgersmb
-if [[ ! -f DEVELOPMENT ]]; then
-#  exec plackup --port 5001 --server Starman tools/starman.psgi \
-  exec plackup --port 5001 --server HTTP::Server::PSGI tools/starman.psgi \
-      --Reload "lib, old/lib, xt/lib, t, xt, /usr/local/share/perl, /usr/share/perl, /usr/share/perl5"
+if [[ ! -v DEVELOPMENT || "$DEVELOPMENT" != "1" ]]; then
+  #SERVER=Starman
+  SERVER=HTTP::Server::PSGI
+  PSGI=tools/starman.psgi
 else
-  exec plackup --port 5001 --server HTTP::Server::PSGI tools/starman-development.psgi \
-      --workers 1 --env development \
-      --Reload "lib, old/lib, xt/lib, t, xt, /usr/local/share/perl, /usr/share/perl, /usr/share/perl5"
+  SERVER=HTTP::Server::PSGI
+  PSGI=tools/starman-development.psgi
+  OPT="--workers 1 --env development"
 fi
+
+set -x
+# start ledgersmb
+exec plackup --port 5001 --server $SERVER $PSGI $OPT \
+      --Reload "lib, old/lib, xt/lib, t, xt, /usr/local/share/perl, /usr/share/perl, /usr/share/perl5"
diff --git a/variables.env b/variables.env
index e19bf62..83c2d4c 100644
--- a/variables.env
+++ b/variables.env
@@ -1,2 +1,2 @@
-DEVELOPMENT=1
+DEVELOPMENT=
 PGHOST=postgres