From 8eb96353dc7c7ed332d0a39bfd07c0c0e0fbb90e Mon Sep 17 00:00:00 2001 From: Jonathan Foley Date: Tue, 18 Sep 2018 22:04:41 -0700 Subject: [PATCH 1/7] upgrade to photon 0.3.0 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f4825c1..43c3e77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* WORKDIR /photon -ADD http://photon.komoot.de/data/photon-0.2.7.jar /photon/photon.jar +ADD https://github.com/komoot/photon/releases/download/0.3.0/photon-0.3.0.jar /photon/photon.jar COPY entrypoint.sh ./entrypoint.sh VOLUME /photon/photon_data From 4a571e74703d970f853ce8550a57399ef07b6636 Mon Sep 17 00:00:00 2001 From: Jonathan Foley Date: Mon, 18 Mar 2019 14:50:31 -0700 Subject: [PATCH 2/7] use pbzip --- entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entrypoint.sh b/entrypoint.sh index 77f8b10..57f7935 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -7,7 +7,7 @@ if [ ! -d "/photon/photon_data/elasticsearch" ]; then # Let graphhopper know where the traffic is coming from USER_AGENT="docker: thomasnordquist/photon-geocoder" - wget --user-agent="$USER_AGENT" -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | bzip2 -cd | tar x + wget --user-agent="$USER_AGENT" -O - http://download1.graphhopper.com/public/photon-db-latest.tar.bz2 | pbzip2 -cd | tar x fi # Start photon if elastic index exists From d081b01b514831c4e34bd6ee6d1108bd6b59717a Mon Sep 17 00:00:00 2001 From: Jonathan Foley Date: Mon, 8 Jul 2019 09:08:57 -0700 Subject: [PATCH 3/7] Expose service on host network --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 47034ae..7ce51cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,3 +13,7 @@ services: volumes: data: driver: local + +networks: + default: + driver: host From f2795bfcdb39ed83eb1529679266fa48a1433ebd Mon Sep 17 00:00:00 2001 From: Jonathan Foley Date: Mon, 8 Jul 2019 09:09:53 -0700 Subject: [PATCH 4/7] update image tag --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7ce51cc..f697971 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: build: context: . dockerfile: Dockerfile - image: thomasnordquist/photon-geocoder:latest + image: jfelectron/geocoder volumes: - data:/photon/photon_data ports: From 9e2398e7b6aa5048f55b41228a784649224127d5 Mon Sep 17 00:00:00 2001 From: Jonathan Foley Date: Mon, 8 Jul 2019 16:14:56 +0000 Subject: [PATCH 5/7] Revert "Expose service on host network" This reverts commit d081b01b514831c4e34bd6ee6d1108bd6b59717a. --- docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f697971..d0fd7e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,3 @@ services: volumes: data: driver: local - -networks: - default: - driver: host From 321fb518c5dada5e7d33e2484199eaa6b2ab68bc Mon Sep 17 00:00:00 2001 From: Jonathan Foley Date: Mon, 8 Jul 2019 16:17:13 +0000 Subject: [PATCH 6/7] bump yaml vers, use host network in build --- docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d0fd7e6..0ed137d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,8 @@ -version: '2' +version: '3.4' services: photon: build: + network: host context: . dockerfile: Dockerfile image: jfelectron/geocoder From d75aee9855559e8a808d26a4d3d9e4e01a297515 Mon Sep 17 00:00:00 2001 From: Jonathan Foley Date: Mon, 8 Jul 2019 11:26:31 -0700 Subject: [PATCH 7/7] bump to photon 0.3.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43c3e77..f5de47d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* WORKDIR /photon -ADD https://github.com/komoot/photon/releases/download/0.3.0/photon-0.3.0.jar /photon/photon.jar +ADD https://github.com/komoot/photon/releases/download/0.3.1/photon-0.3.1.jar /photon/photon.jar COPY entrypoint.sh ./entrypoint.sh VOLUME /photon/photon_data