refact work

.gitignore

@@ -3,4 +3,4 @@ logs
 graphs
 elevation_cache
 data
-
+ors/openrouteservice

README.md

@@ -1,5 +1,13 @@
 # docker-ors-vroom
 
-* test.json example of vroom problem
-* test.sh send test.json to vroom
 
+## Setup
+
+```bash
+git clone https://github.com/GIScience/openrouteservice.git ./ors/openrouteservice
+```
+
+* vroom/test.json example of vroom problem
+* vroom/test.sh send test.json to vroom
+
+* example.ipynb python notebook to test Optimization Routing by ors python binding

docker-compose.yml

@@ -4,33 +4,33 @@ networks:
     driver: bridge
 services:
   ors:
-    container_name: ors-smartbin
+    container_name: smartbin-ors
     #TODO build
     ports: ["8080:8080"]
-    image: docker_ors-smartbin:latest
+    image: smartbin-ors:latest
     build:
-      context: ../openrouteservice/
+      context: ./ors/openrouteservice/
+      #dockerfile: ./ors/openrouteservice/Dockerfile
       args:
-      #    APP_CONFIG: ../docker-ors-vroom/ors.config
-      #    OSM_FILE: ../docker-ors-vroom/data/povo.osm.gz
+          #APP_CONFIG: ../config.json
+          #OSM_FILE: ../../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.json:/ors-core/openrouteservice/src/main/resources/app.config
+      - ./ors/config.json:/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
+      - ./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
-    image: vroom-ors:latest
+    container_name: smartbin-vroom
+    image: smartbin-vroom:latest
     build:
-      context: ./
-
-    ports: ["8083:3000"]
+      context: ./vroom/
+    ports: ["3000:3000"]
     volumes:
-     - ./vroom-config.js:/vroom-express/src/config.js
+     - ./vroom/config.js:/vroom-express/src/config.js
 
   #vroom-test:
   #  image: nginx

vroom/Dockerfile

@@ -0,0 +1,37 @@
+FROM ubuntu:18.04
+
+RUN	apt-get update
+RUN mkdir -p /src
+RUN cd /src
+
+ENV VROOM_BRANCH master
+RUN	apt-get install -qq \
+		build-essential \
+		g++ \
+		git-core \
+		libboost-all-dev \
+		make \
+		pkg-config && \
+	git clone https://github.com/GIScience/vroom.git /src/vroom && \
+	mkdir -p /src/vroom/bin && \
+	cd /src/vroom/src && \
+	make && \
+	cp /src/vroom/bin/vroom /usr/local/bin/
+
+RUN	cd /
+
+ENV VROOM_EXPRESS_BRANCH master
+#RUN apt-get update && \
+RUN	apt-get install -qq \
+		npm \
+		nodejs && \
+	git clone https://github.com/VROOM-Project/vroom-express.git /vroom-express && \
+	cd /vroom-express && \
+	npm install
+
+#COPY config.js /vroom-express/src/config.js
+
+RUN	apt-get clean && cd /
+
+EXPOSE 3000
+CMD ["npm", "start", "--prefix", "/vroom-express"]

vroom-config.js → vroom/config.js

@@ -38,8 +38,8 @@ const routingServers = {
     port: '8080'
   },
   'car': {
-    host: '0.0.0.0',
-    port: '5000'
+    host: 'ors',
+    port: '8080'
   }
 };
 

vroom/test.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+#
+
+curl -d @test.json -X POST -H "Content-Type: application/json" http://localhost:3000