From f10b9b25a2b7a8d4f222bc2700a4cb16a198eb4b Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Tue, 14 Nov 2017 10:52:12 -0500 Subject: [PATCH 1/3] Add libpostal service The Pelias API has now been modified to expect libpostal to live as a separate HTTP service rather than being included in memory. --- docker-compose.yml | 2 -- pelias.json | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5c50517..7b31389 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,6 @@ services: volumes: - "./pelias.json:/code/pelias.json" api: - depends_on: [ "libpostal_baseimage" ] image: pelias/api container_name: pelias_api restart: always @@ -26,7 +25,6 @@ services: networks: [ "pelias" ] volumes: - "./pelias.json:/code/pelias.json" - - "libpostaldata:/usr/share/libpostal" libpostal: image: pelias/go-whosonfirst-libpostal container_name: pelias_libpostal diff --git a/pelias.json b/pelias.json index cd6bc40..8904a8f 100644 --- a/pelias.json +++ b/pelias.json @@ -23,6 +23,9 @@ "placeholder": { "url": "http://placeholder:4100" }, + "libpostal": { + "url": "http://libpostal:8080" + }, "pip": { "url": "http://pip-service:4200" }, From 4986e32a744b12484bbbfbc55ac54ddf241f12e5 Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Fri, 8 Dec 2017 13:23:25 -0500 Subject: [PATCH 2/3] Temporarily use staging branch docker images for API support for the libpostal service has not yet been merged to production, so we need this for now. It should be removed once libpostal support is stable --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7b31389..e07a857 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: volumes: - "./pelias.json:/code/pelias.json" api: - image: pelias/api + image: pelias/api:staging container_name: pelias_api restart: always environment: [ "PORT=4000" ] From d0cb3fe98e77557b7ab21e39a0f48921ef4f98be Mon Sep 17 00:00:00 2001 From: Julian Simioni Date: Mon, 26 Mar 2018 11:17:41 -0400 Subject: [PATCH 3/3] Add libpostal to service start list --- run_services.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/run_services.sh b/run_services.sh index a8bd941..2d012fe 100755 --- a/run_services.sh +++ b/run_services.sh @@ -22,5 +22,6 @@ fi docker-compose up -d interpolation; docker-compose up -d placeholder; docker-compose up -d pip-service; +docker-compose up -d libpostal; docker-compose up -d api;