Merge branch 'master' into quickstart_v2

2016-12-01 10:30:48 +01:00
parent 5a6b6764e6 3b2807d9d1
commit 80b6914b63
26 changed files with 564 additions and 241 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,17 +10,17 @@ services:
     - "5432"
    env_file: .env
  import-natural-earth:
-    image: "openmaptiles/import-natural-earth"
+    image: "openmaptiles/import-natural-earth:1.0"
    env_file: .env
    links:
    - postgres
  import-water:
-    image: "openmaptiles/import-water"
+    image: "openmaptiles/import-water:0.2"
    env_file: .env
    links:
    - postgres
  import-lakelines:
-    image: "openmaptiles/import-lakelines"
+    image: "openmaptiles/import-lakelines:0.9"
    env_file: .env
    links:
    - postgres