diff --git a/docker-compose.yml b/docker-compose.yml index 46cddef..8386dec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,16 +6,17 @@ storage: - ./settings:/home/settings db: - #image: postgis + #image: etrimaille/postgis + #image: kartoza/postgis build: ../docker-postgis hostname: db environment: - USERNAME=docker - PASS=docker - - HSTORE=true + # - HSTORE=true imposm: - #image: imposm + #image: etrimaille/imposm build: ../docker-imposm3 volumes_from: - storage @@ -27,9 +28,12 @@ imposm: - PORT=5432 - HOST=db - DATEBASE=gis + - TIME=120 osmupdate: - #image: osmupdate + #image: etrimaille/osmupdate build: ../docker-osmupdate volumes_from: - storage + environment: + - TIME=120 \ No newline at end of file diff --git a/readme.md b/readme.md index f4c571d..67b5108 100644 --- a/readme.md +++ b/readme.md @@ -1,12 +1,5 @@ -Next to ``docker-osm`` : - -``git clone https://github.com/Gustry/docker-osmupdate.git`` -``git clone https://github.com/Gustry/docker-imposm.git`` -``git clone https://github.com/Gustry/docker-postgis.git`` - -``mkdir base-pbf`` - -Copy a OSM file and its state file(*.state.txt) into base-pbf. The state file contains the timestamp of the OSM file. +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'. ``docker-compose build`` ``docker-compose up`` \ No newline at end of file diff --git a/settings/readme.md b/settings/readme.md new file mode 100644 index 0000000..239b046 --- /dev/null +++ b/settings/readme.md @@ -0,0 +1 @@ +This folder should contain a json file for the mapping. You can also put a SQL file, it will be executed after the PBF import. \ No newline at end of file