Skip to content

Commit daf0707

Browse files
committed
Remove extra -d that failed replication. Setting back to prod repo and branch
1 parent b8df620 commit daf0707

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ FROM postgis/postgis:16-3.4
22

33
LABEL maintainer="PgOSM Flex - https://github.com/rustprooflabs/pgosm-flex"
44

5-
#ARG OSM2PGSQL_BRANCH=master
6-
ARG OSM2PGSQL_BRANCH=fewer-db-conns
7-
# ARG OSM2PGSQL_REPO=https://github.com/openstreetmap/osm2pgsql.git
8-
ARG OSM2PGSQL_REPO=https://github.com/joto/osm2pgsql.git
5+
ARG OSM2PGSQL_BRANCH=master
6+
ARG OSM2PGSQL_REPO=https://github.com/openstreetmap/osm2pgsql.git
97

108

119
RUN apt-get update \

docker/pgosm_flex.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,9 @@ def run_replication_update(skip_nested, flex_path):
268268
osm2pgsql-replication update -d $PGOSM_CONN \
269269
-- \
270270
--output=flex --style=./run.lua \
271-
--slim \
272-
-d $PGOSM_CONN
273-
"""
271+
--slim
272+
"""
273+
274274
update_cmd = update_cmd.replace('-d $PGOSM_CONN', f'-d {conn_string}')
275275
returncode = helpers.run_command_via_subprocess(cmd=update_cmd.split(),
276276
cwd=flex_path,
@@ -422,7 +422,7 @@ def run_osm2pgsql(osm2pgsql_command, flex_path, debug):
422422
"""
423423
logger = logging.getLogger('pgosm-flex')
424424
logger.info('Running osm2pgsql')
425-
425+
426426
returncode = helpers.run_command_via_subprocess(cmd=osm2pgsql_command.split(),
427427
cwd=flex_path,
428428
print=True)

0 commit comments

Comments
 (0)