Skip to content

Merge dev to main, deploy latest #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustprooflabs merged 4 commits into from
Dec 5, 2025
Merged

Merge dev to main, deploy latest #402

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
52526bf
Bump versions to upgrade from Postgres 16 to Postgres 17
rustprooflabs May 25, 2025
9b55f59
Merge pull request #401 from rustprooflabs/postgres-17
rustprooflabs May 25, 2025
0143999
Bump to Postgres 18 and PostGIS 3.6.
rustprooflabs Dec 5, 2025
c5fffce
Merge pull request #403 from rustprooflabs/pg18
rustprooflabs Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM postgis/postgis:16-3.4
# 18-3.6 is Debian Trixie (13)
FROM postgis/postgis:18-3.6

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

Expand All @@ -15,10 +16,10 @@ RUN apt-get update \
libboost-dev libboost-system-dev \
libboost-filesystem-dev libexpat1-dev zlib1g-dev \
libbz2-dev libpq-dev libproj-dev lua5.4 liblua5.4-dev \
python3 python3-distutils \
postgresql-server-dev-16 \
python3 python3.13-venv \
postgresql-server-dev-18 \
curl unzip \
postgresql-16-pgrouting \
postgresql-18-pgrouting \
nlohmann-json3-dev \
osmium-tool \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -28,8 +29,11 @@ RUN wget https://luarocks.org/releases/luarocks-3.9.2.tar.gz \
&& cd luarocks-3.9.2 \
&& ./configure && make && make install

RUN python3 -m venv /venv
ENV PATH="/venv/bin:$PATH"

RUN curl -o /tmp/get-pip.py https://bootstrap.pypa.io/get-pip.py \
&& python3 /tmp/get-pip.py \
&& python /tmp/get-pip.py \
&& rm /tmp/get-pip.py

RUN luarocks install inifile
Expand All @@ -51,12 +55,12 @@ RUN git clone --depth 1 --branch $OSM2PGSQL_BRANCH $OSM2PGSQL_REPO \
&& apt autoremove -y \
&& cd /tmp && rm -r /tmp/osm2pgsql

RUN wget https://github.com/rustprooflabs/pgdd/releases/download/0.5.1/pgdd_0.5.1_postgis_pg16_amd64.deb \
&& dpkg -i ./pgdd_0.5.1_postgis_pg16_amd64.deb \
&& rm ./pgdd_0.5.1_postgis_pg16_amd64.deb \
&& wget https://github.com/rustprooflabs/convert/releases/download/0.0.3/convert_0.0.3_postgis_pg16_amd64.deb \
&& dpkg -i ./convert_0.0.3_postgis_pg16_amd64.deb \
&& rm ./convert_0.0.3_postgis_pg16_amd64.deb
RUN wget https://github.com/rustprooflabs/pgdd/releases/download/0.6.1/pgdd_0.6.1_postgis_pg18_amd64.deb \
&& dpkg -i ./pgdd_0.6.1_postgis_pg18_amd64.deb \
&& rm ./pgdd_0.6.1_postgis_pg18_amd64.deb \
&& wget https://github.com/rustprooflabs/convert/releases/download/0.0.5/convert_0.0.5_postgis_pg18_amd64.deb \
&& dpkg -i ./convert_0.0.5_postgis_pg18_amd64.deb \
&& rm ./convert_0.0.5_postgis_pg18_amd64.deb



Expand Down
Loading