Skip to content

Commit cb6e677

Browse files
pcncdarora
authored andcommitted
chore: ubuntu18 fixes for postgis & plv8
1 parent 2759a89 commit cb6e677

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

.github/workflows/collect-u18-binaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- develop
7-
- pcnc/pg-upgrade-fixes
7+
- pcnc/u18-build-fix
88
paths:
99
- '.github/workflows/collect-u18-binaries.yml'
1010
- 'common.vars.pkr.hcl'

Dockerfile-u18

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ RUN ./configure --with-sfcgal
261261
RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccache \
262262
make -j$(nproc)
263263
# Create debian package
264-
RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --requires=libgeos-c1v5,libproj15,libjson-c4,libprotobuf-c1,libgdal26 --nodoc
264+
RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --requires=libgeos-c1v5,libproj12,libjson-c3,libprotobuf-c1,libgdal20 --nodoc
265265

266266
FROM ppa as postgis
267267
# Latest available is 3.3.2
@@ -516,6 +516,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
516516
ca-certificates \
517517
pkg-config \
518518
ninja-build \
519+
python3 \
519520
git \
520521
libtinfo5 \
521522
&& rm -rf /var/lib/apt/lists/*
@@ -530,8 +531,6 @@ RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc
530531
FROM scratch as plv8-deb
531532
COPY --from=plv8-source /tmp/*.deb /tmp/
532533

533-
FROM ghcr.io/supabase/plv8:${plv8_release}-pg${postgresql_major} as plv8
534-
535534
####################
536535
# 14-pg_plan_filter.yml
537536
####################
@@ -860,7 +859,7 @@ COPY --from=plpgsql_check-source /tmp/*.deb /tmp/
860859
COPY --from=pg-safeupdate-source /tmp/*.deb /tmp/
861860
COPY --from=wal2json-source /tmp/*.deb /tmp/
862861
# COPY --from=pljava /tmp/*.deb /tmp/
863-
COPY --from=plv8 /tmp/*.deb /tmp/
862+
COPY --from=plv8-deb /tmp/*.deb /tmp/
864863
COPY --from=pg_plan_filter-source /tmp/*.deb /tmp/
865864
COPY --from=pg_net-source /tmp/*.deb /tmp/
866865
COPY --from=rum-source /tmp/*.deb /tmp/
@@ -975,7 +974,7 @@ RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccac
975974
FROM scratch as buildcache
976975
COPY --from=stats /tmp /
977976

978-
FROM ubuntu:bionic as pg_binary_collection_base
977+
FROM ppa as pg_binary_collection_base
979978
ARG postgresql_major
980979
ARG postgresql_release
981980
ENV DEBIAN_FRONTEND=noninteractive
@@ -989,9 +988,17 @@ RUN apt-get update && \
989988
apt-get install -y ca-certificates \
990989
libcurl3-gnutls libmecab2 libnghttp2-14 \
991990
libpsl5 librtmp1 libsodium23 mecab-naist-jdic \
992-
mecab-naist-jdic-eucjp mecab-utils publicsuffix
993-
RUN rm -f /tmp/build/extensions/postgis* && \
994-
dpkg -i /tmp/build/extensions/*
991+
mecab-naist-jdic-eucjp mecab-utils publicsuffix \
992+
libcgal-dev libmpfr-dev libgmp-dev \
993+
protobuf-c-compiler \
994+
libgeos-dev \
995+
libproj-dev \
996+
libgdal-dev \
997+
libjson-c-dev \
998+
libxml2-dev \
999+
libprotobuf-c-dev
1000+
1001+
RUN dpkg -i /tmp/build/extensions/*
9951002

9961003
FROM ubuntu:bionic as pg_binary_collection
9971004
ARG postgresql_major

0 commit comments

Comments
 (0)