Resolve rebase conflict

rustprooflabs · Jan 4, 2024 · c3b9c6d · c3b9c6d
1 parent bfa267c
commit c3b9c6d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,7 @@ LABEL maintainer="PgOSM Flex - https://github.com/rustprooflabs/pgosm-flex"
 
 ARG OSM2PGSQL_BRANCH=master
 ARG BOUNCER_VERSION=1.21.0
+ARG OSM2PGSQL_REPO=https://github.com/openstreetmap/osm2pgsql.git
 
 RUN apt-get update \
     # Removed upgrade per https://github.com/rustprooflabs/pgosm-flex/issues/322
@@ -46,7 +47,7 @@ RUN   curl -o  /tmp/pgbouncer-$BOUNCER_VERSION.tar.gz -L https://pgbouncer.githu
   && chown -R postgres /var/run/pgbouncer /etc/pgbouncer /var/log/pgbouncer/
 
 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 \