Fix travis

Author: tcoupin

.npmignore

@@ -1,4 +1,3 @@
 dev
 test
-Gruntfile.js
-init.sh
+Gruntfile.js

.travis.yml

@@ -10,8 +10,7 @@ before_script:
   - curl -L https://github.com/docker/compose/releases/download/1.17.1/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
-  - docker-compose -p pgr -f dev/docker-compose.yml up -d
-  - bash init.sh
+  - bash dev/up.sh
 
 script:
   - docker exec -i -t pgr_node_1 grunt test

README.md

@@ -108,25 +108,22 @@ This table provides:
 
 1. Start demo/dev environmnent
 ```
-docker-compose -p pgr -f dev/docker-compose.yml up -d
-bash init.sh
+bash dev/up.sh
 ```
 
-2. Execute a bash inside the node container
-```
-docker exec -i -t pgr_node_1 bash
-npm install
-```
+2. Use the GUI or the REST service:
 
-Use `grunt` to load HTTP endpoint:
 - http://127.0.0.1:8080, graphical interface : use the right click to define start and end point.
 - http://127.0.0.1:8080/app/version
 - http://127.0.0.1:8080/app/capabilities
 - http://127.0.0.1:8080/app/route?from=46,1&to=47,2&type=duration&avoid=toll
 
-Use `grunt test` to perform unit tests.
+3. Perform unit tests: 
+```
+docker exec -i -t pgr_node_1 grunt test
+```
 
 4. Cleanup Dev env
 ```
-docker-compose -p pgr -f dev/docker-compose.yml down
+bash dev/down.sh
 ```

dev/docker-compose.yml

@@ -16,6 +16,7 @@ services:
     volumes:
       - '..:/app'
     tty: true
+    command: bash /app/dev/start.sh 
 
   gdal:
     image: geodata/gdal:2.1.3

dev/down.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+source $(dirname $0)/env.psql
+
+function dc(){
+	docker-compose -p pgr -f $(dirname $0)/docker-compose.yml "$@"
+}
+
+dc exec node rm -r /app/node_modules
+
+dc down -v
+docker image rm pgr_node

dev/start.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+if [ ! -d /app/node_modules ]
+then
+	npm install
+fi
+grunt

init.sh dev/up.shinit.sh renamed to dev/up.sh

@@ -1,9 +1,28 @@
 #!/bin/bash
-source dev/env.psql
-docker exec -u 999 pgr_postgres_1 psql $POSTGRES_DB -c "CREATE EXTENSION IF NOT EXISTS postgis;"
-docker exec -u 999 pgr_postgres_1 psql $POSTGRES_DB -c "CREATE EXTENSION IF NOT EXISTS pgrouting;"
+
+source $(dirname $0)/env.psql
+
+function dc(){
+	docker-compose -p pgr -f $(dirname $0)/docker-compose.yml "$@"
+}
+
+dc up -d
+dc exec node npm install
+
+status=1
+while [ "$status" != "0" ]
+do
+    sleep 1
+    dc logs postgres | grep "ready for start up"
+    status=$?
+done
+
+
+dc exec -u 999 postgres psql $POSTGRES_DB -c "CREATE EXTENSION IF NOT EXISTS postgis;"
+dc exec -u 999 postgres psql $POSTGRES_DB -c "CREATE EXTENSION IF NOT EXISTS pgrouting;"
+
 echo "==Import data=="
-docker exec pgr_gdal_1 ogr2ogr -progress -overwrite -nln route  -f PostgreSQL PG:"dbname=$POSTGRES_DB host=postgres user=$POSTGRES_USER password=$POSTGRES_PASSWORD port=5432" /data/route120_IGN-F/route.geojson
+dc exec gdal ogr2ogr -progress -overwrite -nln route  -f PostgreSQL PG:"dbname=$POSTGRES_DB host=postgres user=$POSTGRES_USER password=$POSTGRES_PASSWORD port=5432" /data/route120_IGN-F/route.geojson
 echo "==Create topology=="
 
 read -d '' sql_request << ENDSQL
@@ -95,4 +114,5 @@ select pgr_createtopology('edge',0.0001, clean:=true);
 
 ENDSQL
 
-docker exec -u 999 pgr_postgres_1 psql $POSTGRES_DB -c "$sql_request"
+dc exec -u 999 postgres psql $POSTGRES_DB -c "$sql_request"
+dc restart node