Fix full Ubuntu map service in docker-compose.yml (#401)

docker/docker-compose.yml

@@ -252,6 +252,7 @@ services:
       PGUSER: renderer
     volumes:
       - data:/data
+      - tile_data:/var/cache/renderd/tiles
       - ./ubuntu/entrypoint.sh:/entrypoint.sh:ro
   postgres:
     env_file: .env
@@ -260,6 +261,8 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
       POSTGRES_USER: renderer
     image: postgis/postgis
+    ports:
+      - 65432:5432
     volumes:
       - pgdata:/var/lib/postgresql/data
     shm_size: 1gb
@@ -267,3 +270,4 @@ services:
 volumes:
   data:
   pgdata:
+  tile_data:

docker/ubuntu/entrypoint.sh

@@ -20,11 +20,9 @@ then
 
     cd /data/style
 
-    python3 ./scripts/get-external-data.py -c /data/style/external-data.yml -D /data/style/data
+    python3 scripts/get-external-data.py -c /data/style/external-data.yml -D /data/style/data
 
-    ./scripts/get-fonts.sh
-
-    mv fonts/* /usr/share/fonts/
+    scripts/get-fonts.sh
 
     psql --host "${PGHOST}" --user "${PGUSER}" --dbname "${PGDATABASE}" --command "CREATE EXTENSION postgis;"
     psql --host "${PGHOST}" --user "${PGUSER}" --dbname "${PGDATABASE}" --command "CREATE EXTENSION hstore;"
@@ -33,19 +31,31 @@ then
 
     curl --location "${DOWNLOAD_PBF:-http://download.geofabrik.de/asia/vietnam-latest.osm.pbf}" --output /data/region.osm.pbf
 
-    osm2pgsql --host "${PGHOST}" --username "${PGUSER}" --database "${PGDATABASE}" --create --slim -G --hstore \
-        --tag-transform-script /data/style/openstreetmap-carto.lua \
+    osm2pgsql \
+        --create \
+        --database "${PGDATABASE}" \
+        --host "${PGHOST}" \
+        --hstore \
         --number-processes "$(nproc)" \
+        --slim \
+        --tag-transform-script /data/style/openstreetmap-carto.lua \
+        --user "${PGUSER}" \
+        -G \
         -S /data/style/openstreetmap-carto.style \
         /data/region.osm.pbf
 
     psql --host "${PGHOST}" --user "${PGUSER}" --dbname "${PGDATABASE}" --file /data/style/indexes.sql
 
     carto /data/style/project.mml > /data/style/mapnik.xml
-    sed -i 's#/usr/share/renderd/example-map/mapnik.xml#/data/style/mapnik.xml#g' /etc/renderd.conf
-    sed -i 's/URI=/MAXZOOM=20\nMINZOOM=0\URI=/g' /etc/renderd.conf
-    sed -i 's/maxZoom: 12/maxZoom: 20/g' /usr/share/renderd/example-map/index.html
+    sed \
+        -e 's#/usr/share/renderd/example-map/mapnik.xml#/data/style/mapnik.xml#g' \
+        -e 's/URI=/MAXZOOM=20\nMINZOOM=0\nURI=/g' \
+        -e 's#font_dir=/usr/share/fonts#font_dir=/data/style/fonts#g' \
+        /etc/renderd.conf > /data/renderd.conf
 fi
 
+sed -i 's#/etc/renderd.conf#/data/renderd.conf#g' /etc/apache2/sites-enabled/renderd-example-map.conf
+sed -i 's/maxZoom: 12/maxZoom: 20/g' /usr/share/renderd/example-map/index.html
+
 apachectl -e debug -k start
-renderd --foreground
+renderd --config /data/renderd.conf --foreground