diff --git a/Dockerfile b/Dockerfile index 3c964e8..a84c7f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,6 +87,8 @@ RUN cmake .. \ && make -j $(nproc) USER root RUN make install +RUN mkdir /nodes \ + && chown renderer:renderer /nodes USER renderer # Install and test Mapnik diff --git a/README.md b/README.md index d5bcc13..f76ef3e 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,18 @@ docker run \ run ``` +### CACHE + +The import and tile serving processes use 800 MB RAM cache by default, but this number can be changed by option -C. For example: +``` +docker run \ + -p 80:80 \ + -e "OSM2PGSQL_EXTRA_ARGS=-C 4096" \ + -v openstreetmap-data:/var/lib/postgresql/10/main \ + -d overv/openstreetmap-tile-server \ + run +``` + ### AUTOVACUUM The database use the autovacuum feature by default. This behavior can be changed with `AUTOVACUUM` environment variable. For example: diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire index dea6e9e..9e495f6 100644 --- a/openstreetmap-tiles-update-expire +++ b/openstreetmap-tiles-update-expire @@ -22,7 +22,7 @@ OSM2PGSQL_BIN=osm2pgsql TRIM_BIN=/home/$ACCOUNT/src/regional/trim_osc.py DBNAME=gis -OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua -C 2048 --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style" +OSM2PGSQL_OPTIONS="-d $DBNAME -G --hstore ${OSM2PGSQL_EXTRA_ARGS} --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style" #------------------------------------------------------------------------------ # When using trim_osc.py we can define either a bounding box (such as this diff --git a/run.sh b/run.sh index 035835b..3f6c9a3 100755 --- a/run.sh +++ b/run.sh @@ -56,7 +56,7 @@ if [ "$1" = "import" ]; then fi # Import data - sudo -u renderer osm2pgsql -d gis --create --slim -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua -C 2048 --number-processes ${THREADS:-4} ${OSM2PGSQL_EXTRA_ARGS} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style /data.osm.pbf + sudo -u renderer osm2pgsql -d gis --create --slim -G --hstore --tag-transform-script /home/renderer/src/openstreetmap-carto/openstreetmap-carto.lua --number-processes ${THREADS:-4} ${OSM2PGSQL_EXTRA_ARGS} -S /home/renderer/src/openstreetmap-carto/openstreetmap-carto.style /data.osm.pbf # Create indexes sudo -u postgres psql -d gis -f indexes.sql