From 95cf18a50a068f55ff7ef4cfc018a28c407c5b57 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 11 Sep 2018 16:00:11 -0400
Subject: [PATCH] Use new pelias/libpostal-service Docker image

This image, from [pelias/libpostal-service](https://github.com/pelias/libpostal-service)
gives us a bit more control and consistency over how the
libpostal-service is run.

Benefits include:
- smaller download footprint since it shares the
pelias/libpostal_baseimage download with the interpolation service
- non-root `pelias` user and other features common to pelias/baseimage
- default port number consistent with other Pelias services
---
 projects/france/docker-compose.yml            | 4 ++--
 projects/france/pelias.json                   | 2 +-
 projects/los-angeles-metro/docker-compose.yml | 4 ++--
 projects/los-angeles-metro/pelias.json        | 2 +-
 projects/portland-metro/docker-compose.yml    | 4 ++--
 projects/portland-metro/pelias.json           | 6 +++---
 projects/south-africa/docker-compose.yml      | 4 ++--
 projects/south-africa/pelias.json             | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/projects/france/docker-compose.yml b/projects/france/docker-compose.yml
index cbfca3e..6a1a287 100644
--- a/projects/france/docker-compose.yml
+++ b/projects/france/docker-compose.yml
@@ -5,10 +5,10 @@ networks:
 volumes:
 services:
   libpostal:
-    image: pelias/go-whosonfirst-libpostal
+    image: pelias/libpostal-service
     container_name: pelias_libpostal
     restart: always
-    ports: [ "8080:8080" ]
+    ports: [ "4400:4400" ]
   schema:
     image: pelias/schema:portland-synonyms
     container_name: pelias_schema
diff --git a/projects/france/pelias.json b/projects/france/pelias.json
index b501755..864d803 100644
--- a/projects/france/pelias.json
+++ b/projects/france/pelias.json
@@ -21,7 +21,7 @@
     "textAnalyzer": "libpostal",
     "services": {
       "pip": { "url": "http://pip:4200" },
-      "libpostal": { "url": "http://libpostal:8080" },
+      "libpostal": { "url": "http://libpostal:4400" },
       "placeholder": { "url": "http://placeholder:4100" },
       "interpolation": { "url": "http://interpolation:4300" }
     },
diff --git a/projects/los-angeles-metro/docker-compose.yml b/projects/los-angeles-metro/docker-compose.yml
index 8d2eaa0..6a4b7a4 100644
--- a/projects/los-angeles-metro/docker-compose.yml
+++ b/projects/los-angeles-metro/docker-compose.yml
@@ -5,10 +5,10 @@ networks:
 volumes:
 services:
   libpostal:
-    image: pelias/go-whosonfirst-libpostal
+    image: pelias/libpostal-service
     container_name: pelias_libpostal
     restart: always
-    ports: [ "8080:8080" ]
+    ports: [ "4400:4400" ]
   schema:
     image: pelias/schema:portland-synonyms
     container_name: pelias_schema
diff --git a/projects/los-angeles-metro/pelias.json b/projects/los-angeles-metro/pelias.json
index 58494e9..daba78e 100644
--- a/projects/los-angeles-metro/pelias.json
+++ b/projects/los-angeles-metro/pelias.json
@@ -26,7 +26,7 @@
     "textAnalyzer": "libpostal",
     "services": {
       "pip": { "url": "http://pip:4200" },
-      "libpostal": { "url": "http://libpostal:8080" },
+      "libpostal": { "url": "http://libpostal:4400" },
       "placeholder": { "url": "http://placeholder:4100" },
       "interpolation": { "url": "http://interpolation:4300" }
     },
diff --git a/projects/portland-metro/docker-compose.yml b/projects/portland-metro/docker-compose.yml
index 5d00084..4c63714 100644
--- a/projects/portland-metro/docker-compose.yml
+++ b/projects/portland-metro/docker-compose.yml
@@ -4,10 +4,10 @@ networks:
     driver: bridge
 services:
   libpostal:
-    image: pelias/go-whosonfirst-libpostal
+    image: pelias/libpostal-service
     container_name: pelias_libpostal
     restart: always
-    ports: [ "8080:8080" ]
+    ports: [ "4400:4400" ]
   schema:
     image: pelias/schema:portland-synonyms
     container_name: pelias_schema
diff --git a/projects/portland-metro/pelias.json b/projects/portland-metro/pelias.json
index 330de11..b77f3a0 100644
--- a/projects/portland-metro/pelias.json
+++ b/projects/portland-metro/pelias.json
@@ -25,10 +25,10 @@
   "api": {
     "textAnalyzer": "libpostal",
     "services": {
-      "pip": { "url": "http://pip:4200" },
-      "libpostal": { "url": "http://libpostal:8080" },
       "placeholder": { "url": "http://placeholder:4100" },
-      "interpolation": { "url": "http://interpolation:4300" }
+      "pip": { "url": "http://pip:4200" },
+      "interpolation": { "url": "http://interpolation:4300" },
+      "libpostal": { "url": "http://libpostal:4400" }
     },
     "defaultParameters": {
       "focus.point.lat": 45.52,
diff --git a/projects/south-africa/docker-compose.yml b/projects/south-africa/docker-compose.yml
index f9f7e1f..901b396 100644
--- a/projects/south-africa/docker-compose.yml
+++ b/projects/south-africa/docker-compose.yml
@@ -5,10 +5,10 @@ networks:
 volumes:
 services:
   libpostal:
-    image: pelias/go-whosonfirst-libpostal
+    image: pelias/libpostal-service
     container_name: pelias_libpostal
     restart: always
-    ports: [ "8080:8080" ]
+    ports: [ "4400:4400" ]
   schema:
     image: pelias/schema:master
     container_name: pelias_schema
diff --git a/projects/south-africa/pelias.json b/projects/south-africa/pelias.json
index 160696d..562efb8 100644
--- a/projects/south-africa/pelias.json
+++ b/projects/south-africa/pelias.json
@@ -26,7 +26,7 @@
     "textAnalyzer": "libpostal",
     "services": {
       "pip": { "url": "http://pip:4200" },
-      "libpostal": { "url": "http://libpostal:8080" },
+      "libpostal": { "url": "http://libpostal:4400" },
       "placeholder": { "url": "http://placeholder:4100" },
       "interpolation": { "url": "http://interpolation:4300" }
     }