Skip to content

Commit 6f35269

Browse files
ImreSamuImreSamu
authored
make update 2021-Aug-19 (#253)
* make update 2021-Aug-19 * Remove Debian -script version; see: #253 (comment) * make update
1 parent 813d944 commit 6f35269

File tree

13 files changed

+31
-31
lines changed

13 files changed

+31
-31
lines changed

‎10-2.5/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎10-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ FROM postgres:10
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.2+dfsg-1~exp2.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg90+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎11-2.5/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎11-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ FROM postgres:11
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.2+dfsg-1~exp2.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg90+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎12-2.5/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎12-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ FROM postgres:12
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.2+dfsg-1~exp2.pgdg100+1
6+
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg100+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎12-master/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ RUN set -ex \
7979

8080
# proj
8181
ENV PROJ_VERSION master
82-
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
82+
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
8383

8484
RUN set -ex \
8585
&& cd /usr/src \
@@ -95,7 +95,7 @@ RUN set -ex \
9595

9696
# geos
9797
ENV GEOS_VERSION master
98-
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
98+
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
9999

100100
RUN set -ex \
101101
&& cd /usr/src \
@@ -112,7 +112,7 @@ RUN set -ex \
112112

113113
# gdal
114114
ENV GDAL_VERSION master
115-
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
115+
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
116116

117117
RUN set -ex \
118118
&& cd /usr/src \
@@ -171,9 +171,9 @@ RUN set -ex \
171171
COPY --from=builder /usr/local /usr/local
172172

173173
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
174-
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
175-
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
176-
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
174+
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
175+
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
176+
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
177177

178178
# Minimal command line test.
179179
RUN set -ex \
@@ -187,7 +187,7 @@ RUN set -ex \
187187

188188
# install postgis
189189
ENV POSTGIS_VERSION master
190-
ENV POSTGIS_GIT_HASH 9ee72d5cb6e9b049c1b048f77d28140e18b18504
190+
ENV POSTGIS_GIT_HASH 86a8a59791431b279e4d6511c96af0d3e45332d5
191191

192192
RUN set -ex \
193193
&& apt-get update \

‎13-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ FROM postgres:13
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.2+dfsg-1~exp2.pgdg100+1
6+
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg100+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎13-master/Dockerfile

+7-7
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ RUN set -ex \
7979

8080
# proj
8181
ENV PROJ_VERSION master
82-
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
82+
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
8383

8484
RUN set -ex \
8585
&& cd /usr/src \
@@ -95,7 +95,7 @@ RUN set -ex \
9595

9696
# geos
9797
ENV GEOS_VERSION master
98-
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
98+
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
9999

100100
RUN set -ex \
101101
&& cd /usr/src \
@@ -112,7 +112,7 @@ RUN set -ex \
112112

113113
# gdal
114114
ENV GDAL_VERSION master
115-
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
115+
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
116116

117117
RUN set -ex \
118118
&& cd /usr/src \
@@ -171,9 +171,9 @@ RUN set -ex \
171171
COPY --from=builder /usr/local /usr/local
172172

173173
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
174-
ENV PROJ_GIT_HASH 7063808658c11296eb9e49ffe3ba157b60043026
175-
ENV GEOS_GIT_HASH 16610691611decd2b9545ea68ef41e8b94f859e6
176-
ENV GDAL_GIT_HASH 7fbaca67612f8b672055069c83db18c5beeb8f80
174+
ENV PROJ_GIT_HASH 6ee8c26b60e99e347dad8b7d6fb33b5316973f9d
175+
ENV GEOS_GIT_HASH 511bb3f2cf2d2f8bcf581cd101f350047aa97a35
176+
ENV GDAL_GIT_HASH 4efc764d666b23243fae9a1dc8a82e33324bfdfa
177177

178178
# Minimal command line test.
179179
RUN set -ex \
@@ -187,7 +187,7 @@ RUN set -ex \
187187

188188
# install postgis
189189
ENV POSTGIS_VERSION master
190-
ENV POSTGIS_GIT_HASH 9ee72d5cb6e9b049c1b048f77d28140e18b18504
190+
ENV POSTGIS_GIT_HASH 86a8a59791431b279e4d6511c96af0d3e45332d5
191191

192192
RUN set -ex \
193193
&& apt-get update \

‎14beta3-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ FROM postgres:14beta3
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.2+dfsg-1~exp2.pgdg100+1
6+
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg100+1+b1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎9.6-2.5/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎9.6-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ FROM postgres:9.6
33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.2+dfsg-1~exp2.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.3+dfsg-1~exp1.pgdg90+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

‎Dockerfile.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1010
&& apt-get install -y --no-install-recommends \
1111
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
12-
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts=$POSTGIS_VERSION \
12+
postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
1313
&& rm -rf /var/lib/apt/lists/*
1414

1515
RUN mkdir -p /docker-entrypoint-initdb.d

0 commit comments

Comments
 (0)