Skip to content

Commit eaf0d74

Browse files
committed
Install libgomp1 in second stage as required to run gdal master
1 parent d0d29b2 commit eaf0d74

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

16-master/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -ex \
105105
# cgal & sfcgal
106106
ARG CGAL_GIT_BRANCH
107107
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
108-
ENV CGAL_GIT_HASH=51b5eaa7c5ee0abc3b96a60ad9733f85ab06cc2c
108+
ENV CGAL_GIT_HASH=9b728c437c096113ba711a4186817ac90c97aae3
109109
ENV SFCGAL_GIT_HASH=0adcd006a4300a8de09c623b5d9c0e0d8bacfd1a
110110
RUN set -ex \
111111
&& mkdir -p /usr/src \
@@ -185,7 +185,7 @@ RUN set -ex \
185185
&& rm -fr /usr/src/geos
186186

187187
# gdal
188-
ENV GDAL_GIT_HASH=16df635c529b940e26b04009385113a00d133a59
188+
ENV GDAL_GIT_HASH=0a76107e6e821bd098e4ff412958bf161c90153e
189189
RUN set -ex \
190190
&& cd /usr/src \
191191
&& git clone https://github.com/OSGeo/gdal.git \
@@ -304,6 +304,7 @@ RUN set -ex \
304304
libcfitsio9 \
305305
libfreexl1 \
306306
libfyba0 \
307+
libgomp1 \
307308
libhdf5-103-1 \
308309
libkmlbase1 \
309310
libkmldom1 \
@@ -318,11 +319,11 @@ COPY --from=builder /usr/local /usr/local
318319

319320
ARG CGAL_GIT_BRANCH
320321
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
321-
ENV CGAL_GIT_HASH=51b5eaa7c5ee0abc3b96a60ad9733f85ab06cc2c
322+
ENV CGAL_GIT_HASH=9b728c437c096113ba711a4186817ac90c97aae3
322323
ENV SFCGAL_GIT_HASH=0adcd006a4300a8de09c623b5d9c0e0d8bacfd1a
323324
ENV PROJ_GIT_HASH=b03fb3177baa2775bd476b3a1845f16ba61958fc
324325
ENV GEOS_GIT_HASH=c7ca3dd29bf379c43ae6f97fbc1bdfa10dcf630e
325-
ENV GDAL_GIT_HASH=16df635c529b940e26b04009385113a00d133a59
326+
ENV GDAL_GIT_HASH=0a76107e6e821bd098e4ff412958bf161c90153e
326327

327328
# Minimal command line test ( fail fast )
328329
RUN set -ex \
@@ -341,7 +342,7 @@ RUN set -ex \
341342
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
342343

343344
# install postgis
344-
ENV POSTGIS_GIT_HASH=875ba8eb1c2782c80ae157e3490790d87470d447
345+
ENV POSTGIS_GIT_HASH=bf36aef0ca85b254b8576f0936d377612a4668c0
345346

346347
RUN set -ex \
347348
&& apt-get update \

17-master/Dockerfile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ RUN set -ex \
105105
# cgal & sfcgal
106106
ARG CGAL_GIT_BRANCH
107107
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
108-
ENV CGAL_GIT_HASH=51b5eaa7c5ee0abc3b96a60ad9733f85ab06cc2c
108+
ENV CGAL_GIT_HASH=9b728c437c096113ba711a4186817ac90c97aae3
109109
ENV SFCGAL_GIT_HASH=0adcd006a4300a8de09c623b5d9c0e0d8bacfd1a
110110
RUN set -ex \
111111
&& mkdir -p /usr/src \
@@ -185,7 +185,7 @@ RUN set -ex \
185185
&& rm -fr /usr/src/geos
186186

187187
# gdal
188-
ENV GDAL_GIT_HASH=16df635c529b940e26b04009385113a00d133a59
188+
ENV GDAL_GIT_HASH=0a76107e6e821bd098e4ff412958bf161c90153e
189189
RUN set -ex \
190190
&& cd /usr/src \
191191
&& git clone https://github.com/OSGeo/gdal.git \
@@ -304,6 +304,7 @@ RUN set -ex \
304304
libcfitsio9 \
305305
libfreexl1 \
306306
libfyba0 \
307+
libgomp1 \
307308
libhdf5-103-1 \
308309
libkmlbase1 \
309310
libkmldom1 \
@@ -318,11 +319,11 @@ COPY --from=builder /usr/local /usr/local
318319

319320
ARG CGAL_GIT_BRANCH
320321
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
321-
ENV CGAL_GIT_HASH=51b5eaa7c5ee0abc3b96a60ad9733f85ab06cc2c
322+
ENV CGAL_GIT_HASH=9b728c437c096113ba711a4186817ac90c97aae3
322323
ENV SFCGAL_GIT_HASH=0adcd006a4300a8de09c623b5d9c0e0d8bacfd1a
323324
ENV PROJ_GIT_HASH=b03fb3177baa2775bd476b3a1845f16ba61958fc
324325
ENV GEOS_GIT_HASH=c7ca3dd29bf379c43ae6f97fbc1bdfa10dcf630e
325-
ENV GDAL_GIT_HASH=16df635c529b940e26b04009385113a00d133a59
326+
ENV GDAL_GIT_HASH=0a76107e6e821bd098e4ff412958bf161c90153e
326327

327328
# Minimal command line test ( fail fast )
328329
RUN set -ex \
@@ -341,7 +342,7 @@ RUN set -ex \
341342
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
342343

343344
# install postgis
344-
ENV POSTGIS_GIT_HASH=875ba8eb1c2782c80ae157e3490790d87470d447
345+
ENV POSTGIS_GIT_HASH=bf36aef0ca85b254b8576f0936d377612a4668c0
345346

346347
RUN set -ex \
347348
&& apt-get update \

Dockerfile.master.template

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ RUN set -ex \
304304
libcfitsio9 \
305305
libfreexl1 \
306306
libfyba0 \
307+
libgomp1 \
307308
libhdf5-103-1 \
308309
libkmlbase1 \
309310
libkmldom1 \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This image ensures that the default database created by the parent `postgres` im
2121

2222
Unless `-e POSTGRES_DB` is passed to the container at startup time, this database will be named after the admin user (either `postgres` or the user specified with `-e POSTGRES_USER`). If you would prefer to use the older template database mechanism for enabling PostGIS, the image also provides a PostGIS-enabled template database called `template_postgis`.
2323

24-
## Versions (2026-02-03)
24+
## Versions (2026-02-04)
2525

2626
Supported architecture: `amd64` (x86-64)
2727

0 commit comments

Comments
 (0)