Skip to content

fix: update NPROC to be only a build argument #442

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
strk merged 1 commit into from
Feb 18, 2026
Merged

fix: update NPROC to be only a build argument #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions 13-3.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:13-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 13 Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
7 changes: 3 additions & 4 deletions 14-3.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:14-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 14 Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
7 changes: 3 additions & 4 deletions 15-3.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:15-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 15 Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
7 changes: 3 additions & 4 deletions 16-3.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:16-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 16 Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
16 changes: 8 additions & 8 deletions 16-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

ARG DOCKER_CMAKE_BUILD_TYPE=Release
ARG CGAL_GIT_BRANCH=main
ARG NPROC=
FROM docker.io/postgres:16-bullseye as builder

ARG NPROC
ENV NPROC=${NPROC}

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 16 bullseye" \
Expand Down Expand Up @@ -131,7 +131,7 @@ RUN set -ex \
-DSFCGAL_BUILD_EXAMPLES=OFF \
-DSFCGAL_BUILD_TESTS=OFF \
-DSFCGAL_WITH_OSG=OFF \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
#
## testing with -DSFCGAL_BUILD_TESTS=ON
Expand All @@ -155,7 +155,7 @@ RUN set -ex \
&& echo "autotools version: 'autogen.sh' exists! Older version!" \
&& ./autogen.sh \
&& ./configure --disable-static \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
; \
else \
Expand All @@ -164,7 +164,7 @@ RUN set -ex \
&& mkdir build \
&& cd build \
&& cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
; \
fi \
Expand All @@ -182,7 +182,7 @@ RUN set -ex \
&& mkdir cmake-build \
&& cd cmake-build \
&& cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
&& cd / \
&& rm -fr /usr/src/geos
Expand Down Expand Up @@ -252,7 +252,7 @@ RUN set -ex \
; \
fi \
\
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
&& cd / \
&& rm -fr /usr/src/gdal
Expand Down Expand Up @@ -392,7 +392,7 @@ RUN set -ex \
# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316
&& projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \
Expand All @@ -406,7 +406,7 @@ RUN set -ex \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& ldconfig \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
7 changes: 3 additions & 4 deletions 17-3.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:17-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.5.4 spatial database extension with PostgreSQL 17 Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
7 changes: 3 additions & 4 deletions 17-3.6/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:17-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.1 spatial database extension with PostgreSQL 17 Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
16 changes: 8 additions & 8 deletions 17-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@

ARG DOCKER_CMAKE_BUILD_TYPE=Release
ARG CGAL_GIT_BRANCH=main
ARG NPROC=
FROM docker.io/postgres:17-bullseye as builder

ARG NPROC
ENV NPROC=${NPROC}

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS - master spatial database extension with PostgreSQL 17 bullseye" \
Expand Down Expand Up @@ -131,7 +131,7 @@ RUN set -ex \
-DSFCGAL_BUILD_EXAMPLES=OFF \
-DSFCGAL_BUILD_TESTS=OFF \
-DSFCGAL_WITH_OSG=OFF \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
#
## testing with -DSFCGAL_BUILD_TESTS=ON
Expand All @@ -155,7 +155,7 @@ RUN set -ex \
&& echo "autotools version: 'autogen.sh' exists! Older version!" \
&& ./autogen.sh \
&& ./configure --disable-static \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
; \
else \
Expand All @@ -164,7 +164,7 @@ RUN set -ex \
&& mkdir build \
&& cd build \
&& cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
; \
fi \
Expand All @@ -182,7 +182,7 @@ RUN set -ex \
&& mkdir cmake-build \
&& cd cmake-build \
&& cmake .. -DCMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE} -DBUILD_TESTING=OFF \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
&& cd / \
&& rm -fr /usr/src/geos
Expand Down Expand Up @@ -252,7 +252,7 @@ RUN set -ex \
; \
fi \
\
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
&& cd / \
&& rm -fr /usr/src/gdal
Expand Down Expand Up @@ -392,7 +392,7 @@ RUN set -ex \
# https://anonscm.debian.org/cgit/pkg-grass/postgis.git/tree/debian/rules?h=jessie
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
# refresh proj data - workarounds: https://trac.osgeo.org/postgis/ticket/5316
&& projsync --system-directory --file ch_swisstopo_CHENyx06_ETRS \
Expand All @@ -406,7 +406,7 @@ RUN set -ex \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& ldconfig \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
7 changes: 3 additions & 4 deletions 18-3.6/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:18-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS 3.6.1 spatial database extension with PostgreSQL 18 Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
7 changes: 3 additions & 4 deletions Dockerfile.alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
ARG BASE_IMAGE=postgres:%%PG_MAJOR%%-alpine3.22
FROM ${BASE_IMAGE}

ARG NPROC
ENV NPROC=${NPROC}
ARG NPROC=

LABEL maintainer="PostGIS Project - https://postgis.net" \
org.opencontainers.image.description="PostGIS %%POSTGIS_VERSION%% spatial database extension with PostgreSQL %%PG_MAJOR%% Alpine" \
Expand Down Expand Up @@ -65,7 +64,7 @@ RUN set -eux \
&& ./autogen.sh \
&& ./configure \
--enable-lto \
&& make -j${NPROC:=$(nproc)} \
&& make -j${NPROC:-$(nproc)} \
&& make install \
\
# This section is for refreshing the proj data for the regression tests.
Expand All @@ -81,7 +80,7 @@ RUN set -eux \
&& su postgres -c 'pg_ctl -D /tempdb init' \
&& su postgres -c 'pg_ctl -D /tempdb -c -l /tmp/logfile -o '-F' start ' \
&& cd regress \
&& make -j${NPROC:=$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
&& make -j${NPROC:-$(nproc)} check RUNTESTFLAGS="--extension --verbose" PGUSER=postgres \
\
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis;"' \
&& su postgres -c 'psql -c "CREATE EXTENSION IF NOT EXISTS postgis_raster;"' \
Expand Down
Loading
Loading