Merge branch 'master' into quickstart_v2

This commit is contained in:
ImreSamu 2016-12-07 13:07:46 +01:00
commit 78d0bf1619

View File

@ -1,6 +1,7 @@
version: "2" version: "2"
volumes: volumes:
pgdata: pgdata:
cache:
services: services:
postgres: postgres:
image: "openmaptiles/postgis:2.3" image: "openmaptiles/postgis:2.3"
@ -28,12 +29,13 @@ services:
image: "openmaptiles/import-osm:latest" image: "openmaptiles/import-osm:latest"
env_file: .env env_file: .env
environment: environment:
DIFF_MODE: "false" DIFF_MODE: ${DIFF_MODE}
links: links:
- postgres - postgres
volumes: volumes:
- ./data:/import - ./data:/import
- ./build:/mapping - ./build:/mapping
- cache:/cache
import-sql: import-sql:
image: "openmaptiles/import-sql:0.1" image: "openmaptiles/import-sql:0.1"
env_file: .env env_file: .env