Merge branch 'master' of https://github.com/pelias/docker into 93-war…

…nDATA_DIR

README.md

@@ -15,7 +15,7 @@ Once you have successfully completed a small build you can use this as a base to
 
 You will need to have `docker` and `docker-compose` installed before continuing. If you are not using the latest version, please mention that in any bugs reports.
 
-## Requirements for Mac OSX:
+## Requirements for Mac OSX
 - install GNU coreutils with [Homebrew](https://brew.sh/): `brew install coreutils`.
 - Max-out Docker computing resources( `Memory-RAM and CPUs-Cores` ) dedicated to Docker in `Docker > Preferences > Advanced`.
 
@@ -25,20 +25,22 @@ Scripts can easily download tens of GB of geographic data, so ensure you have en
 
 At least 8GB RAM is required.
 
-## Installing the Pelias command
+## Installing the Pelias helper script
+
+This repository makes use of a helper script to make basic management of the Pelias Docker images easy.
 
 If you haven't done so already, you will need to ensure the `pelias` command is available on your path.
 
 You can find the `pelias` file in the root of this repository.
 
-Advanced users may have a preferance how this is done on their system, but a basic example would be to do something like:
+Advanced users may have a preference how this is done on their system, but a basic example would be to do something like:
 
 ```bash
 git clone https://github.com/pelias/docker.git ~/pelias
 ln -s ~/pelias/pelias /usr/local/bin/pelias
 ```
 
-Once the command is correctly installed you should be able to run the following command to confim the pelias command is available on your path:
+Once the command is correctly installed you should be able to run the following command to confirm the pelias command is available on your path:
 
 ```bash
 which pelias

cmd/download.sh

@@ -13,6 +13,7 @@ function download_csv(){ compose_run 'csv-importer' './bin/download'; }
 register 'download' 'wof' '(re)download whosonfirst data' download_wof
 register 'download' 'oa' '(re)download openaddresses data' download_oa
 register 'download' 'osm' '(re)download openstreetmap data' download_osm
+register 'download' 'geonames' '(re)download geonames data' download_geonames
 register 'download' 'tiger' '(re)download TIGER data' download_tiger
 register 'download' 'transit' '(re)download transit data' download_transit
 register 'download' 'csv' '(re)download csv data' download_csv

images/elasticsearch/2.4/Dockerfile

@@ -4,3 +4,7 @@ FROM elasticsearch:2.4
 # configure plugins
 RUN /usr/share/elasticsearch/bin/plugin install analysis-icu
 RUN /usr/share/elasticsearch/bin/plugin install cloud-aws
+
+# elasticsearch config
+ADD elasticsearch.yml /usr/share/elasticsearch/config/
+RUN chown elasticsearch:elasticsearch config/elasticsearch.yml

images/elasticsearch/2.4/elasticsearch.yml

@@ -0,0 +1,8 @@
+bootstrap.memory_lock: true
+network.host: 0.0.0.0
+http.port: 9200
+node.master: true
+node.data: true
+threadpool:
+  bulk:
+    queue_size: 1000

projects/france/pelias.json

@@ -61,7 +61,7 @@
       "datapath": "/data/whosonfirst",
       "importVenues": false,
       "importPostalcodes": true,
-      "importPlace": [ "136253037" ]
+      "importPlace": [ "136253037", "85633147" ]
     }
   }
 }

projects/planet/README.md

@@ -28,6 +28,10 @@ The minimum configuration required in order to run this project are [installing
 
 Please ensure that's all working fine before continuing.
 
+## Acceptance tests
+
+This project uses [git submodules](https://git-scm.com/book/en/v2/Git-Tools-Submodules) to pull in the [pelias/acceptance-test](https://github.com/pelias/acceptance-tests/) repository to allow testing full planet builds.
+
 ### Caveats
 
 A full planet build will require a street polylines file generated with Valhalla. Please see [the documentation](https://github.com/pelias/polylines/wiki/Generating-polylines-from-Valhalla) on how to perform that build.
@@ -37,6 +41,9 @@ A full planet build will require a street polylines file generated with Valhalla
 To run a complete build, execute the following commands:
 
 ```bash
+git submodule init
+git submodule update
+
 pelias compose pull
 pelias elastic start
 pelias elastic wait
@@ -45,6 +52,7 @@ pelias download all
 pelias prepare all
 pelias import all
 pelias compose up
+
 pelias test run
 ```
 

projects/planet/docker-compose.yml

@@ -110,7 +110,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
     environment: [ "ES_JAVA_OPTS=-Xmx8g" ]

projects/planet/pelias.json

@@ -4,7 +4,7 @@
     "timestamp": false
   },
   "esclient": {
-    "apiVersion": "2.4",
+    "apiVersion": "5.6",
     "hosts": [
       { "host": "elasticsearch" }
     ]
@@ -67,10 +67,7 @@
     "interpolation": {
       "download": {
         "tiger": {
-          "datapath": "/data/tiger",
-          "states": [
-            { "state_code": 53, "county_code": 11, "name": "Clark County, WA" }
-          ]
+          "datapath": "/data/tiger"
         }
       }
     }