Migrate to docker #641 - Simplify scripts and remove duplicated docke…

…r-compose file.
IsraelHikingMap · Apr 19, 2020 · 44b0bd2 · 44b0bd2
1 parent 1f1979e
commit 44b0bd2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 29 deletions.
diff --git a/Graphhopper/docker-compose-gh-rebuild.yml b/Graphhopper/docker-compose-gh-rebuild.yml
diff --git a/Graphhopper/refrash-graph.ps1 b/Graphhopper/refrash-graph.ps1
diff --git a/IsraelHiking.sln b/IsraelHiking.sln
@@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		docker-compose.yml = docker-compose.yml
 		Dockerfile = Dockerfile
+		gh-config.yml = gh-config.yml
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -35,6 +36,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{3585
 		Scripts\BuildAndPublishIOS.ps1 = Scripts\BuildAndPublishIOS.ps1
 		Scripts\CleanLogs.cmd = Scripts\CleanLogs.cmd
 		Scripts\Deploy.ps1 = Scripts\Deploy.ps1
+		gh-update.cmd = gh-update.cmd
 		Scripts\TestAndPublishWeb.ps1 = Scripts\TestAndPublishWeb.ps1
 	EndProjectSection
 EndProject
@@ -43,13 +45,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{3E9EFE32-6
 		docs\faq.md = docs\faq.md
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Graphhopper", "Graphhopper", "{C5007659-0E97-48ED-8638-0622B63B5011}"
-	ProjectSection(SolutionItems) = preProject
-		Graphhopper\docker-compose-gh-rebuild.yml = Graphhopper\docker-compose-gh-rebuild.yml
-		Graphhopper\gh-config.yml = Graphhopper\gh-config.yml
-		Graphhopper\refrash-graph.ps1 = Graphhopper\refrash-graph.ps1
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -153,7 +148,6 @@ Global
 		{32A771F8-7A45-4359-9E22-B3CF5155C9A8} = {F72D33D1-176B-4BC5-851A-F71C1ABA74D9}
 		{3585675D-C9A0-4E48-A11D-4B9E789A0B0A} = {F82C943F-37C1-45DF-A2CF-7EFFB9C0B467}
 		{3E9EFE32-6A08-4960-AD00-83AC5FEAB259} = {F82C943F-37C1-45DF-A2CF-7EFFB9C0B467}
-		{C5007659-0E97-48ED-8638-0622B63B5011} = {F82C943F-37C1-45DF-A2CF-7EFFB9C0B467}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {82D60BA1-DDEE-4F6B-B842-56EF5620175E}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,9 @@ services:
     container_name: graphhopper
     volumes:
       - ghdata:/data:rw
-      - ./Graphhopper/gh-config.yml:/data/gh-config.yml
+      - type: bind
+        source: ./gh-config.yml
+        target: /data/gh-config.yml
     ports:
       - 8989:8989
     command: -i - -c /data/gh-config.yml -o /data/default-gh/

diff --git a/Graphhopper/gh-config.yml → gh-config.yml b/Graphhopper/gh-config.yml → gh-config.yml
diff --git a/gh-update.cmd b/gh-update.cmd
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker-compose run --rm --entrypoint /bin/bash graphhopper -c "./graphhopper.sh import asia_israel-and-palestine.pbf -c /data/gh-config.yml -fd -o /data/new-gh/ && rm -rf /data/default-gh/ && mv /data/new-gh /data/default-gh"
+docker-compose restart graphhopper