Merge pull request #376 from rustprooflabs/reduced-conns-test

Updates for latest osm2pgsql - reducing connections to Postgres

Author: rustprooflabs

Dockerfile

@@ -3,6 +3,8 @@ FROM postgis/postgis:16-3.4
 LABEL maintainer="PgOSM Flex - https://github.com/rustprooflabs/pgosm-flex"
 
 ARG OSM2PGSQL_BRANCH=master
+ARG OSM2PGSQL_REPO=https://github.com/osm2pgsql-dev/osm2pgsql.git
+
 
 RUN apt-get update \
     # Removed upgrade per https://github.com/rustprooflabs/pgosm-flex/issues/322
@@ -34,7 +36,7 @@ RUN luarocks install luasql-postgres PGSQL_INCDIR=/usr/include/postgresql/
 
 
 WORKDIR /tmp
-RUN git clone --depth 1 --branch $OSM2PGSQL_BRANCH https://github.com/openstreetmap/osm2pgsql.git \
+RUN git clone --depth 1 --branch $OSM2PGSQL_BRANCH $OSM2PGSQL_REPO \
     && mkdir osm2pgsql/build \
     && cd osm2pgsql/build \
     && cmake .. -D USE_PROJ_LIB=6 \

docker/pgosm_flex.py

@@ -268,9 +268,9 @@ def run_replication_update(skip_nested, flex_path):
 osm2pgsql-replication update -d $PGOSM_CONN \
     -- \
     --output=flex --style=./run.lua \
-    --slim \
-    -d $PGOSM_CONN
-"""
+    --slim
+    """
+
     update_cmd = update_cmd.replace('-d $PGOSM_CONN', f'-d {conn_string}')
     returncode = helpers.run_command_via_subprocess(cmd=update_cmd.split(),
                                                     cwd=flex_path,
@@ -422,7 +422,7 @@ def run_osm2pgsql(osm2pgsql_command, flex_path, debug):
     """
     logger = logging.getLogger('pgosm-flex')
     logger.info('Running osm2pgsql')
-        
+
     returncode = helpers.run_command_via_subprocess(cmd=osm2pgsql_command.split(),
                                                     cwd=flex_path,
                                                     print=True)