Updating -full docker services for testing

Author: hummeltech

.github/workflows/docker-image-build.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Lint with hadolint
-        uses: hadolint/hadolint-action@v3.1.0
+        uses: hadolint/hadolint-action@v3.3.0
         with:
           dockerfile: Dockerfile*
           failure-threshold: warning

docker/archlinux/Dockerfile

@@ -35,6 +35,7 @@ RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cac
         git \
         glib2 \
         iniparser \
+        jemalloc \
         lcov \
         libmemcached \
         make \
@@ -53,7 +54,8 @@ RUN CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)" && export CMAKE_BUILD_PARALLEL_LEVEL &
         -DCMAKE_INSTALL_PREFIX:PATH=/usr \
         -DCMAKE_INSTALL_RUNSTATEDIR:PATH=/run \
         -DCMAKE_INSTALL_SYSCONFDIR:PATH=/etc \
-        -DENABLE_TESTS:BOOL=ON && \
+        -DENABLE_TESTS:BOOL=ON \
+        -DMALLOC_LIB:STRING=jemalloc && \
     cmake --build .
 RUN CTEST_PARALLEL_LEVEL="$(nproc)" && export CTEST_PARALLEL_LEVEL && \
     ctest --output-on-failure
@@ -76,6 +78,7 @@ RUN --mount=type=cache,sharing=locked,id=archlinux:${archlinux_version}-/var/cac
         curl \
         glib2 \
         iniparser \
+        jemalloc \
         libmemcached \
         mapnik \
         memcached \

docker/docker-compose.yml

@@ -316,7 +316,7 @@ services:
       <<: *build_defaults_ubuntu
       args:
         libiniparser_version: 4
-        libmapnik_version: "4.1"
+        libmapnik_version: "4.2"
         runner_additional_packages: >-
           curl
           gdal-bin

docker/full-entrypoint.sh

@@ -1,49 +1,37 @@
 #!/usr/bin/env sh
 
-if [ ! -f /opt/styles/mapnik.xml ]
-then
-    git clone https://github.com/gravitystorm/openstreetmap-carto.git --depth 1 /opt/openstreetmap-carto
+export DATADIR=/opt/data
+export FONTDIR=/opt/fonts
+export MAPNIK_XML=/opt/styles/mapnik.xml
 
-    cp --archive /opt/openstreetmap-carto/patterns /opt/openstreetmap-carto/symbols /opt/styles/
+sed -i \
+    -e "s#^xml=.*#xml=${MAPNIK_XML}#Ig" \
+    -e "s#^pid_file=#num_threads=-1\npid_file=#Ig" \
+    -e "s#^font_dir=.*#font_dir=${FONTDIR}#Ig" \
+    /etc/renderd.conf
 
-    python3 /opt/openstreetmap-carto/scripts/get-external-data.py --cache --config /opt/openstreetmap-carto/external-data.yml --data /opt/data
+if [ ! -f ${MAPNIK_XML} ]
+then
+    export OPENSTREETMAP_CARTO_DIR=/opt/openstreetmap-carto
+    git clone https://github.com/openstreetmap-carto/openstreetmap-carto.git --depth 1 ${OPENSTREETMAP_CARTO_DIR}
 
-    cd /opt && /opt/openstreetmap-carto/scripts/get-fonts.sh && cd -
+    cp --archive ${OPENSTREETMAP_CARTO_DIR}/patterns ${OPENSTREETMAP_CARTO_DIR}/symbols /opt/styles/
 
-    psql --command "CREATE EXTENSION postgis;" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
-    psql --command "CREATE EXTENSION hstore;" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
-    psql --command "ALTER TABLE geometry_columns OWNER TO ${PGUSER};" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
-    psql --command "ALTER TABLE spatial_ref_sys OWNER TO ${PGUSER};" --dbname "${PGDATABASE}" --host "${PGHOST}" --user "${PGUSER}"
+    export EXTERNAL_DATA_SCRIPT_FLAGS="--cache --config ${OPENSTREETMAP_CARTO_DIR}/external-data.yml --data ${DATADIR} --no-update"
+    export OSM2PGSQL_DATAFILE="${DATADIR}/region.osm.pbf"
 
-    if [ ! -f /opt/data/region.osm.pbf ]
+    if [ ! -f ${OSM2PGSQL_DATAFILE} ]
     then
-        curl --location "${DOWNLOAD_PBF:-http://download.geofabrik.de/asia/vietnam-latest.osm.pbf}" --output /opt/data/region.osm.pbf
+        curl --location "${DOWNLOAD_PBF:-http://download.geofabrik.de/asia/vietnam-latest.osm.pbf}" --output ${OSM2PGSQL_DATAFILE}
     fi
 
-    osm2pgsql \
-        --create \
-        --database "${PGDATABASE}" \
-        --host "${PGHOST}" \
-        --hstore \
-        --number-processes "$(nproc)" \
-        --slim \
-        --tag-transform-script /opt/openstreetmap-carto/openstreetmap-carto.lua \
-        --user "${PGUSER}" \
-        -G \
-        -S /opt/openstreetmap-carto/openstreetmap-carto.style \
-        /opt/data/region.osm.pbf
-
-    psql --dbname "${PGDATABASE}" --file /opt/openstreetmap-carto/indexes.sql --host "${PGHOST}" --user "${PGUSER}"
+    cd ${OPENSTREETMAP_CARTO_DIR}
+
+    sh scripts/docker-startup.sh import
 
     npm install --global carto
-    carto /opt/openstreetmap-carto/project.mml > /opt/styles/mapnik.xml
+    carto ${OPENSTREETMAP_CARTO_DIR}/project.mml > ${MAPNIK_XML}
 fi
 
-sed -i \
-    -e 's#/usr/share/renderd/example-map/mapnik.xml#/opt/styles/mapnik.xml#g' \
-    -e 's/pid_file=/num_threads=-1\npid_file=/g' \
-    -e 's#font_dir=.*#font_dir=/opt/fonts#g' \
-    /etc/renderd.conf
-
 apachectl -e debug -k start
 renderd --foreground