Skip to content

Commit d2806db

Browse files
ImreSamuImreSamu
authored
add ca-certificates: for accessing remote raster files; (#311)
* add ca-certificates: for accessing remote raster files; fix: #307 * add ca-certificates check the *-master template * fix master-template error
1 parent a6a9f02 commit d2806db

File tree

24 files changed

+135
-35
lines changed

24 files changed

+135
-35
lines changed

‎10-2.5/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 2.5.5+dfsg-1.pgdg90+2
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎10-2.5/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎10-3.2/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎10-3.2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎11-2.5/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 2.5.5+dfsg-1.pgdg90+2
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎11-2.5/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎11-3.2/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎11-3.2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎12-3.2/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎12-3.2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎13-3.2/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎13-3.2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎13-master/Dockerfile

+16-11
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -ex \
6262
# sfcgal
6363
ENV SFCGAL_VERSION master
6464
#current:
65-
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
65+
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
6666
#reverted for the last working version
6767
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6868

@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
85+
ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
114114

115115
# geos
116116
ENV GEOS_VERSION master
117-
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
117+
ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
134+
ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -209,10 +209,10 @@ RUN set -ex \
209209

210210
COPY --from=builder /usr/local /usr/local
211211

212-
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
213-
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
214-
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
215-
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
212+
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
213+
ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
214+
ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
215+
ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
216216

217217
# Minimal command line test.
218218
RUN set -ex \
@@ -230,7 +230,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
230230

231231
# install postgis
232232
ENV POSTGIS_VERSION master
233-
ENV POSTGIS_GIT_HASH 2fca9d65ced41fe2cbe36d0f9d05d109b39d70db
233+
ENV POSTGIS_GIT_HASH d31888c038285d36b460e34773e5dddece27d585
234234

235235
RUN set -ex \
236236
&& apt-get update \
@@ -300,7 +300,6 @@ RUN set -ex \
300300
autotools-dev \
301301
bison \
302302
build-essential \
303-
ca-certificates \
304303
cmake \
305304
g++ \
306305
git \
@@ -327,5 +326,11 @@ RUN set -ex \
327326
RUN mkdir -p /docker-entrypoint-initdb.d
328327
COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh
329328
COPY ./update-postgis.sh /usr/local/bin
330-
RUN cat /_pgis_full_version.txt
331329

330+
RUN set -ex \
331+
# Is the "ca-certificates" package installed? (for accessing remote raster files)
332+
# https://github.com/postgis/docker-postgis/issues/307
333+
&& dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \
334+
\
335+
# list postgresql, postgis version
336+
&& cat /_pgis_full_version.txt

‎14-3.2/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎14-3.2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎14-3.3.0rc2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎14-master/Dockerfile

+16-11
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -ex \
6262
# sfcgal
6363
ENV SFCGAL_VERSION master
6464
#current:
65-
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
65+
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
6666
#reverted for the last working version
6767
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6868

@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
85+
ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
114114

115115
# geos
116116
ENV GEOS_VERSION master
117-
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
117+
ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
134+
ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -209,10 +209,10 @@ RUN set -ex \
209209

210210
COPY --from=builder /usr/local /usr/local
211211

212-
#ENV SFCGAL_GIT_HASH 8675662a2725976642d0ecffd4efcfe68e484483
213-
ENV PROJ_GIT_HASH 1384b90602a6d2d51ed5ca0d2e28c8b4ada47aea
214-
ENV GEOS_GIT_HASH 848bce44d308a05d082766da21ea5d9db2e79b8e
215-
ENV GDAL_GIT_HASH 581246a1ccaf62438e20be371f82453c19d54394
212+
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
213+
ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
214+
ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
215+
ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
216216

217217
# Minimal command line test.
218218
RUN set -ex \
@@ -230,7 +230,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
230230

231231
# install postgis
232232
ENV POSTGIS_VERSION master
233-
ENV POSTGIS_GIT_HASH 2fca9d65ced41fe2cbe36d0f9d05d109b39d70db
233+
ENV POSTGIS_GIT_HASH d31888c038285d36b460e34773e5dddece27d585
234234

235235
RUN set -ex \
236236
&& apt-get update \
@@ -300,7 +300,6 @@ RUN set -ex \
300300
autotools-dev \
301301
bison \
302302
build-essential \
303-
ca-certificates \
304303
cmake \
305304
g++ \
306305
git \
@@ -327,5 +326,11 @@ RUN set -ex \
327326
RUN mkdir -p /docker-entrypoint-initdb.d
328327
COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh
329328
COPY ./update-postgis.sh /usr/local/bin
330-
RUN cat /_pgis_full_version.txt
331329

330+
RUN set -ex \
331+
# Is the "ca-certificates" package installed? (for accessing remote raster files)
332+
# https://github.com/postgis/docker-postgis/issues/307
333+
&& dpkg-query -W -f='${Status}' ca-certificates 2>/dev/null | grep -c "ok installed" \
334+
\
335+
# list postgresql, postgis version
336+
&& cat /_pgis_full_version.txt

‎15beta3-3.2/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
11+
# ca-certificates: for accessing remote raster files;
12+
# fix: https://github.com/postgis/docker-postgis/issues/307
13+
ca-certificates \
14+
\
1115
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
1216
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1317
&& rm -rf /var/lib/apt/lists/*

‎15beta3-3.2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

‎15beta3-3.3.0rc2/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ RUN set -eux \
118118
libstdc++ \
119119
pcre \
120120
protobuf-c \
121+
\
122+
# ca-certificates: for accessing remote raster files
123+
# fix https://github.com/postgis/docker-postgis/issues/307
124+
ca-certificates \
121125
# clean
122126
&& cd / \
123127
&& rm -rf /usr/src/postgis \

0 commit comments

Comments
 (0)