From e312fb80f31e956e9cefce1655c77e3d53170362 Mon Sep 17 00:00:00 2001
From: stefanocudini <stefano.cudini@gmail.com>
Date: Thu, 13 Feb 2020 18:57:05 +0100
Subject: [PATCH] contexts

---
 Dockerfile         |  2 --
 docker-compose.yml | 17 +++++++++++------
 vroom-test.sh      |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9983609..caf052e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,6 @@ RUN git clone https://github.com/VROOM-Project/vroom-express.git /vroom-express
 
 #RUN mkdir /vroom-express
 #ADD ./vroom-express /vroom-express
-
 #TODO volume
 
 ENV VROOM_EXPRESS_BRANCH master
@@ -41,4 +40,3 @@ RUN apt-get update && \
 
 EXPOSE 3000
 CMD ["npm", "start", "--prefix", "/vroom-express"]
-
diff --git a/docker-compose.yml b/docker-compose.yml
index eafa93d..e1ee315 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,28 +4,33 @@ networks:
     driver: bridge
 services:
   ors:
-    #container_name: ors-smartbin
+    container_name: ors-smartbin
     #TODO build
     ports: ["8080:8080"]
     image: docker_ors-smartbin:latest
     build:
-      context: ./
+      context: ../openrouteservice/
       args:
-          APP_CONFIG: ./ors.config
-          OSM_FILE: ./data/povo.osm.gz
+      #    APP_CONFIG: ../docker-ors-vroom/ors.config
+      #    OSM_FILE: ../docker-ors-vroom/data/povo.osm.gz
           JAVA_OPTS: -Djava.awt.headless=true -server -XX:TargetSurvivorRatio=75 -XX:SurvivorRatio=64 -XX:MaxTenuringThreshold=3 -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Xms1g -Xmx2g
           CATALINA_OPTS: -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=9001 -Dcom.sun.management.jmxremote.rmi.port=9001 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=localhost
     volumes:
+      - ./ors.config:/ors-core/openrouteservice/src/main/resources/app.config
+      - ./data/povo.osm.gz:/ors-core/data/osm_file.pbf
       - ./graphs:/ors-core/data/graphs
       - ./elevation_cache:/ors-core/data/elevation_cache
       - ./logs/:/var/log/ors/
       - ./logs/:/usr/local/tomcat/logs
   vroom:
-    #container_name: vroom-smartbin
+    container_name: vroom-smartbin
     image: vroom-ors:latest
+    build:
+      context: ./
+      
     ports: ["8083:3000"]
     volumes:
-     - "./vroom.config.js:/vroom-express/src/config.js"
+     - ./vroom.config.js:/vroom-express/src/config.js
 
   #vroom-test:
   #  image: nginx
diff --git a/vroom-test.sh b/vroom-test.sh
index 571a8ea..b2b46d7 100755
--- a/vroom-test.sh
+++ b/vroom-test.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 #
 
-curl -X POST -H "Content-Type: application/json" -d vroom-problem.json http://localhost:8083
+curl -d @vroom-problem.json -X POST -H "Content-Type: application/json" http://localhost:8083