Skip to content

Commit 1cf6764

Browse files
ImreSamuImreSamu
authored
update to bullseye; 14rc1 (#257)
* update to bullseye; 14rc1 * remove 12-2.5 ; no posgis2.5 in the bullseye * exclude 12-2.5 from the gitlab workflows * fix gitlab workflows * fix master; move all debian posgis3.1 to bullseye * revert 12-master; add 14rc1-master * fix github workflow
1 parent ad2a7bb commit 1cf6764

31 files changed

+126
-403
lines changed

‎.github/workflows/main.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,21 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [9.6, 10, 11, 12, 13, '14beta3']
18+
postgres: [9.6, 10, 11, 12, 13, '14rc1']
1919
postgis: ['2.5', '3.1']
2020
variant: [default, alpine]
2121
exclude:
22+
- postgres: 12
23+
postgis: '2.5'
2224
- postgres: 13
2325
postgis: '2.5'
24-
- postgres: '14beta3'
26+
- postgres: '14rc1'
2527
postgis: '2.5'
2628
include:
27-
- postgres: 12
29+
- postgres: 13
2830
postgis: master
2931
variant: default
30-
- postgres: 13
32+
- postgres: 14rc1
3133
postgis: master
3234
variant: default
3335
name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}

‎10-2.5/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:10
1+
FROM postgres:10-stretch
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

‎10-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM postgres:10
1+
FROM postgres:10-bullseye
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎11-2.5/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM postgres:11
1+
FROM postgres:11-stretch
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

‎11-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM postgres:11
1+
FROM postgres:11-bullseye
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg90+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎12-2.5/Dockerfile

-18
This file was deleted.

‎12-2.5/alpine/Dockerfile

-110
This file was deleted.

‎12-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM postgres:12
1+
FROM postgres:12-bullseye
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg100+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎13-3.1/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM postgres:13
1+
FROM postgres:13-bullseye
22

33
LABEL maintainer="PostGIS Project - https://postgis.net"
44

55
ENV POSTGIS_MAJOR 3
6-
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg100+1
6+
ENV POSTGIS_VERSION 3.1.4+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
99
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \

‎13-master/Dockerfile

+35-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# "experimental" ; only for testing!
22
# multi-stage dockerfile; minimal docker version >= 17.05
3-
FROM postgres:13 as builder
3+
FROM postgres:13-bullseye as builder
44

55
LABEL maintainer="PostGIS Project - https://postgis.net"
66

@@ -11,22 +11,21 @@ RUN set -ex \
1111
&& apt-get update \
1212
&& apt-get install -y --no-install-recommends \
1313
curl \
14-
libboost-atomic1.67.0 \
15-
libboost-chrono1.67.0 \
16-
libboost-date-time1.67.0 \
17-
libboost-filesystem1.67.0 \
18-
libboost-program-options1.67.0 \
19-
libboost-serialization1.67.0 \
20-
libboost-system1.67.0 \
21-
libboost-test1.67.0 \
22-
libboost-thread1.67.0 \
23-
libboost-timer1.67.0 \
24-
libcgal13 \
14+
libboost-atomic1.74.0 \
15+
libboost-chrono1.74.0 \
16+
libboost-date-time1.74.0 \
17+
libboost-filesystem1.74.0 \
18+
libboost-program-options1.74.0 \
19+
libboost-serialization1.74.0 \
20+
libboost-system1.74.0 \
21+
libboost-test1.74.0 \
22+
libboost-thread1.74.0 \
23+
libboost-timer1.74.0 \
2524
libcurl3-gnutls \
2625
libexpat1 \
2726
libgmp10 \
2827
libgmpxx4ldbl \
29-
libjson-c3 \
28+
libjson-c5 \
3029
libmpfr6 \
3130
libprotobuf-c1 \
3231
libtiff5 \
@@ -61,6 +60,9 @@ RUN set -ex \
6160

6261
# sfcgal
6362
ENV SFCGAL_VERSION master
63+
#current:
64+
#ENV SFCGAL_GIT_HASH 815d5097f684dbc48b22041bf2047beab36df0a1
65+
#reverted for the last working version
6466
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6567

6668
RUN set -ex \
@@ -79,7 +81,7 @@ RUN set -ex \
7981

8082
# proj
8183
ENV PROJ_VERSION master
82-
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
84+
ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f
8385

8486
RUN set -ex \
8587
&& cd /usr/src \
@@ -95,7 +97,7 @@ RUN set -ex \
9597

9698
# geos
9799
ENV GEOS_VERSION master
98-
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
100+
ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b
99101

100102
RUN set -ex \
101103
&& cd /usr/src \
@@ -112,7 +114,7 @@ RUN set -ex \
112114

113115
# gdal
114116
ENV GDAL_VERSION master
115-
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
117+
ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38
116118

117119
RUN set -ex \
118120
&& cd /usr/src \
@@ -138,28 +140,27 @@ RUN set -ex \
138140
&& sfcgal-config --version \
139141
&& pcre-config --version
140142

141-
FROM postgres:13
143+
FROM postgres:13-bullseye
142144

143145
RUN set -ex \
144146
&& apt-get update \
145147
&& apt-get install -y --no-install-recommends \
146148
curl \
147-
libboost-atomic1.67.0 \
148-
libboost-chrono1.67.0 \
149-
libboost-date-time1.67.0 \
150-
libboost-filesystem1.67.0 \
151-
libboost-program-options1.67.0 \
152-
libboost-serialization1.67.0 \
153-
libboost-system1.67.0 \
154-
libboost-test1.67.0 \
155-
libboost-thread1.67.0 \
156-
libboost-timer1.67.0 \
157-
libcgal13 \
149+
libboost-atomic1.74.0 \
150+
libboost-chrono1.74.0 \
151+
libboost-date-time1.74.0 \
152+
libboost-filesystem1.74.0 \
153+
libboost-program-options1.74.0 \
154+
libboost-serialization1.74.0 \
155+
libboost-system1.74.0 \
156+
libboost-test1.74.0 \
157+
libboost-thread1.74.0 \
158+
libboost-timer1.74.0 \
158159
libcurl3-gnutls \
159160
libexpat1 \
160161
libgmp10 \
161162
libgmpxx4ldbl \
162-
libjson-c3 \
163+
libjson-c5 \
163164
libmpfr6 \
164165
libpcre3 \
165166
libprotobuf-c1 \
@@ -170,10 +171,10 @@ RUN set -ex \
170171

171172
COPY --from=builder /usr/local /usr/local
172173

173-
ENV SFCGAL_GIT_HASH 495719bb7969973f322fea7de1c0982c4ebbdec8
174-
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
175-
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
176-
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
174+
#ENV SFCGAL_GIT_HASH 815d5097f684dbc48b22041bf2047beab36df0a1
175+
ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f
176+
ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b
177+
ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38
177178

178179
# Minimal command line test.
179180
RUN set -ex \
@@ -187,7 +188,7 @@ RUN set -ex \
187188

188189
# install postgis
189190
ENV POSTGIS_VERSION master
190-
ENV POSTGIS_GIT_HASH 6f9f76b7395f5c27c69c2136c53608e44ba0d38f
191+
ENV POSTGIS_GIT_HASH 0568b9c6c628ac55c643cd017c8edb5315718d7c
191192

192193
RUN set -ex \
193194
&& apt-get update \

0 commit comments

Comments
 (0)