Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/continuous-delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
echo "PG_IMAGE=$(echo "${BUILD_METADATA}" | jq -r '.["minimal"].["image.name"]' | grep -oP '[^,]*\d{12}[^,]*')" >> $GITHUB_ENV

call-reusable-e2e:
if: github.event_name == 'schedule'
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
needs:
- build-pg
uses: ./.github/workflows/reusable-e2e.yml
Expand Down
16 changes: 15 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ FROM standard AS postgis
USER root
ARG POSTGIS_REPO=https://github.com/postgis/postgis.git
ARG POSTGIS_BRANCH=master
ARG ADDRESS_STANDARDIZER_REPO=https://github.com/postgis/address_standardizer.git
ARG ADDRESS_STANDARDIZER_BRANCH=main

RUN apt-get update && \
apt-get install -y --no-install-recommends \
Expand All @@ -137,16 +139,28 @@ RUN apt-get update && \
libgdal36 \
libgeos-c1t64 \
libsfcgal2 \
# address_standardizer
libpcre2-8-0 \
libpcre2-posix3 \
&& \
# PostGIS
mkdir -p /usr/src/postgis && \
git clone -b "$POSTGIS_BRANCH" --single-branch "$POSTGIS_REPO" /usr/src/postgis && \
cd /usr/src/postgis && \
./autogen.sh && \
./configure --with-pgconfig=/usr/lib/postgresql/$PG_MAJOR/bin/pg_config --with-sfcgal && \
make -j$(nproc) && \
make install && \
# address_standardizer
mkdir -p /usr/src/address_standardizer && \
git clone -b "$ADDRESS_STANDARDIZER_BRANCH" --single-branch "$ADDRESS_STANDARDIZER_REPO" /usr/src/address_standardizer && \
cd /usr/src/address_standardizer && \
make && \
make install && \
ln -s /usr/lib/x86_64-linux-gnu/postgresql/address_standardizer.so /usr/lib/x86_64-linux-gnu/postgresql/address_standardizer-3.so && \
# Cleanup
apt-get purge -y --auto-remove $(cat /build-deps.txt) && \
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
rm -rf /var/lib/apt/lists/* /var/cache/* /var/log/* /usr/src/postgis
rm -rf /var/lib/apt/lists/* /var/cache/* /var/log/* /usr/src/postgis /usr/src/address_standardizer

USER 26
3 changes: 2 additions & 1 deletion build-deps.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ bison
build-essential
clang-19
cmake
docbook5-xml
docbook-xml
docbook5-xml
flex
gettext
git
Expand All @@ -23,6 +23,7 @@ libldap-dev
liblz4-dev
libnuma-dev
libpam0g-dev
libpcre2-dev
libperl-dev
libproj-dev
libprotobuf-c-dev
Expand Down
Loading