From b7aa175593287ad5e63698c1d57ff545e2f6d524 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Thu, 30 Jul 2015 10:25:38 +0200 Subject: [PATCH] doc --- docker-compose.yml | 12 ++++++------ readme.md | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8386dec..51b3ca6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,9 @@ storage: - ./settings:/home/settings db: - #image: etrimaille/postgis + image: etrimaille/postgis #image: kartoza/postgis - build: ../docker-postgis + #build: ../docker-postgis hostname: db environment: - USERNAME=docker @@ -16,8 +16,8 @@ db: # - HSTORE=true imposm: - #image: etrimaille/imposm - build: ../docker-imposm3 + image: etrimaille/imposm + #build: ../docker-imposm3 volumes_from: - storage links: @@ -31,8 +31,8 @@ imposm: - TIME=120 osmupdate: - #image: etrimaille/osmupdate - build: ../docker-osmupdate + image: etrimaille/osmupdate + #build: ../docker-osmupdate volumes_from: - storage environment: diff --git a/readme.md b/readme.md index 67b5108..75afebd 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,7 @@ -Copy an OSM file (*.pbf) and its state file(*.state.txt) into base-pbf. The state file contains the timestamp of the OSM file. -Check that a *.json is present in 'settings'. +Copy an OSM file (*.pbf) and its state file(*.state.txt) into base-pbf. The state file contains the timestamp of the OSM file. You can add a [polygon file](http://wiki.openstreetmap.org/wiki/Osmosis/Polygon_Filter_File_Format) for the clipping. +Check that a *.json is present in 'settings' for the mapping. ``docker-compose build`` -``docker-compose up`` \ No newline at end of file +``docker-compose up`` + +You should read the documentation about [docker-imposm](https://github.com/gustry/docker-imposm3) and [docker-osmupdate](https://github.com/Gustry/docker-osmupdate) for settings.