From 1f417353a7aff6857bdcd36855a943076a633a42 Mon Sep 17 00:00:00 2001
From: Julian Simioni <julian@simioni.org>
Date: Tue, 23 Oct 2018 12:35:40 -0400
Subject: [PATCH 1/2] fix(docs): Add line setting proper permissions in README

There has been some confusion after we switched the Docker images to use
a non-root user. It's now fairly easy for permissions to be set
incorrectly.

This line in the example script should make things right.
---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index de805e6..bfc3877 100644
--- a/README.md
+++ b/README.md
@@ -252,6 +252,9 @@ set -x
 # create directories
 mkdir /code /data
 
+# set proper permissions. make sure the user matches your `DOCKER_USER` setting in `.env`
+chown 1000:1000 /code /data
+
 # clone repo
 cd /code
 git clone https://github.com/pelias/docker.git

From 1e67c264efdadfdd3345cd49b00d857fa861f689 Mon Sep 17 00:00:00 2001
From: Peter Johnson <insomnia@rcpt.at>
Date: Fri, 28 Sep 2018 15:40:23 +0200
Subject: [PATCH 2/2] feat(es5): switch projects to use elasticsearch 5.x

---
 projects/australia/docker-compose.yml         | 2 +-
 projects/australia/pelias.json                | 1 +
 projects/france/docker-compose.yml            | 2 +-
 projects/france/pelias.json                   | 1 +
 projects/los-angeles-metro/docker-compose.yml | 2 +-
 projects/los-angeles-metro/pelias.json        | 1 +
 projects/portland-metro/docker-compose.yml    | 2 +-
 projects/portland-metro/pelias.json           | 1 +
 projects/south-africa/docker-compose.yml      | 2 +-
 projects/south-africa/pelias.json             | 1 +
 10 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/projects/australia/docker-compose.yml b/projects/australia/docker-compose.yml
index 7a49a30..d8433f9 100644
--- a/projects/australia/docker-compose.yml
+++ b/projects/australia/docker-compose.yml
@@ -93,7 +93,7 @@ services:
       - "./pelias.json:/code/pelias.json"
       - "${DATA_DIR}:/data"
   elasticsearch:
-    image: pelias/elasticsearch
+    image: pelias/elasticsearch:5.6.12
     container_name: pelias_elasticsearch
     restart: always
     ports: [ "9200:9200", "9300:9300" ]
diff --git a/projects/australia/pelias.json b/projects/australia/pelias.json
index d1c0af5..a43ae7f 100644
--- a/projects/australia/pelias.json
+++ b/projects/australia/pelias.json
@@ -4,6 +4,7 @@
     "timestamp": false
   },
   "esclient": {
+    "apiVersion": "5.6",
     "hosts": [
       { "host": "elasticsearch" }
     ]
diff --git a/projects/france/docker-compose.yml b/projects/france/docker-compose.yml
index 0b7d212..9a6420f 100644
--- a/projects/france/docker-compose.yml
+++ b/projects/france/docker-compose.yml
@@ -83,7 +83,7 @@ services:
       - "./pelias.json:/code/pelias.json"
       - "${DATA_DIR}:/data"
   elasticsearch:
-    image: pelias/elasticsearch
+    image: pelias/elasticsearch:5.6.12
     container_name: pelias_elasticsearch
     restart: always
     ports: [ "9200:9200", "9300:9300" ]
diff --git a/projects/france/pelias.json b/projects/france/pelias.json
index 864d803..d5de2bc 100644
--- a/projects/france/pelias.json
+++ b/projects/france/pelias.json
@@ -4,6 +4,7 @@
     "timestamp": false
   },
   "esclient": {
+    "apiVersion": "5.6",
     "hosts": [
       { "host": "elasticsearch" }
     ]
diff --git a/projects/los-angeles-metro/docker-compose.yml b/projects/los-angeles-metro/docker-compose.yml
index 955e30d..f935f87 100644
--- a/projects/los-angeles-metro/docker-compose.yml
+++ b/projects/los-angeles-metro/docker-compose.yml
@@ -92,7 +92,7 @@ services:
       - "./pelias.json:/code/pelias.json"
       - "${DATA_DIR}:/data"
   elasticsearch:
-    image: pelias/elasticsearch
+    image: pelias/elasticsearch:5.6.12
     container_name: pelias_elasticsearch
     restart: always
     ports: [ "9200:9200", "9300:9300" ]
diff --git a/projects/los-angeles-metro/pelias.json b/projects/los-angeles-metro/pelias.json
index daba78e..93bc64e 100644
--- a/projects/los-angeles-metro/pelias.json
+++ b/projects/los-angeles-metro/pelias.json
@@ -4,6 +4,7 @@
     "timestamp": false
   },
   "esclient": {
+    "apiVersion": "5.6",
     "hosts": [
       { "host": "elasticsearch" }
     ]
diff --git a/projects/portland-metro/docker-compose.yml b/projects/portland-metro/docker-compose.yml
index 205389f..dd771d8 100644
--- a/projects/portland-metro/docker-compose.yml
+++ b/projects/portland-metro/docker-compose.yml
@@ -95,7 +95,7 @@ services:
       - "./pelias.json:/code/pelias.json"
       - "${DATA_DIR}:/data"
   elasticsearch:
-    image: pelias/elasticsearch
+    image: pelias/elasticsearch:5.6.12
     container_name: pelias_elasticsearch
     restart: always
     ports: [ "9200:9200", "9300:9300" ]
diff --git a/projects/portland-metro/pelias.json b/projects/portland-metro/pelias.json
index b77f3a0..a1ad747 100644
--- a/projects/portland-metro/pelias.json
+++ b/projects/portland-metro/pelias.json
@@ -4,6 +4,7 @@
     "timestamp": false
   },
   "esclient": {
+    "apiVersion": "5.6",
     "hosts": [
       { "host": "elasticsearch" }
     ]
diff --git a/projects/south-africa/docker-compose.yml b/projects/south-africa/docker-compose.yml
index 5e80df5..8422f17 100644
--- a/projects/south-africa/docker-compose.yml
+++ b/projects/south-africa/docker-compose.yml
@@ -100,7 +100,7 @@ services:
     volumes:
       - "../../common/preview:/usr/share/nginx/html"
   elasticsearch:
-    image: pelias/elasticsearch
+    image: pelias/elasticsearch:5.6.12
     container_name: pelias_elasticsearch
     restart: always
     ports: [ "9200:9200", "9300:9300" ]
diff --git a/projects/south-africa/pelias.json b/projects/south-africa/pelias.json
index 562efb8..83c4273 100644
--- a/projects/south-africa/pelias.json
+++ b/projects/south-africa/pelias.json
@@ -4,6 +4,7 @@
     "timestamp": false
   },
   "esclient": {
+    "apiVersion": "5.6",
     "hosts": [
       { "host": "elasticsearch" }
     ]