diff --git a/Dockerfile.compute-node b/Dockerfile.compute-node index 950ec16016..2e031b17da 100644 --- a/Dockerfile.compute-node +++ b/Dockerfile.compute-node @@ -1,4 +1,7 @@ ARG TAG=pinned +# apparently, ARGs don't get replaced in RUN commands in kaniko +# ARG POSTGIS_VERSION=3.3.0 +# ARG PLV8_VERSION=3.1.4 FROM debian:bullseye-slim AS build-deps RUN apt update && \ @@ -24,9 +27,9 @@ COPY --from=pg-build /usr/local/pgsql/ /usr/local/pgsql/ RUN apt update && \ apt install -y gdal-bin libgdal-dev libprotobuf-c-dev protobuf-c-compiler xsltproc wget -RUN wget https://download.osgeo.org/postgis/source/postgis-3.2.3.tar.gz && \ - tar xvzf postgis-3.2.3.tar.gz && \ - cd postgis-3.2.3 && \ +RUN wget https://download.osgeo.org/postgis/source/postgis-3.3.0.tar.gz && \ + tar xvzf postgis-3.3.0.tar.gz && \ + cd postgis-3.3.0 && \ ./autogen.sh && \ export PATH="/usr/local/pgsql/bin:$PATH" && \ ./configure && \ @@ -52,18 +55,18 @@ RUN echo "deb http://ftp.debian.org/debian testing main" >> /etc/apt/sources.lis apt update && \ apt install -y --no-install-recommends -t testing binutils -RUN wget https://github.com/plv8/plv8/archive/refs/tags/v3.1.3.tar.gz && \ - tar xvzf v3.1.3.tar.gz && \ - cd plv8-3.1.3 && \ +RUN wget https://github.com/plv8/plv8/archive/refs/tags/v3.1.4.tar.gz && \ + tar xvzf v3.1.4.tar.gz && \ + cd plv8-3.1.4 && \ export PATH="/usr/local/pgsql/bin:$PATH" && \ - make && \ - make install && \ + make -j $(getconf _NPROCESSORS_ONLN) && \ + make -j $(getconf _NPROCESSORS_ONLN) install && \ rm -rf /plv8-* && \ echo 'trusted = true' >> /usr/local/pgsql/share/extension/plv8.control # compile neon extensions FROM build-deps AS neon-pg-ext-build -COPY --from=plv8-build /usr/local/pgsql/ /usr/local/pgsql/ +COPY --from=postgis-build /usr/local/pgsql/ /usr/local/pgsql/ COPY pgxn/ pgxn/ RUN make -j $(getconf _NPROCESSORS_ONLN) \