Skip to content

update to bullseye; 14rc1 #257

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
merged 7 commits into from
Sep 27, 2021
Merged

update to bullseye; 14rc1 #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d48adc5
update to bullseye; 14rc1
ImreSamu Sep 24, 2021
21236cf
remove 12-2.5 ; no posgis2.5 in the bullseye
ImreSamu Sep 24, 2021
cd16b69
exclude 12-2.5 from the gitlab workflows
ImreSamu Sep 24, 2021
5e470d8
fix gitlab workflows
ImreSamu Sep 24, 2021
84d2347
fix master; move all debian posgis3.1 to bullseye
ImreSamu Sep 24, 2021
0df1b3b
revert 12-master; add 14rc1-master
ImreSamu Sep 24, 2021
a863fa7
fix github workflow
ImreSamu Sep 24, 2021
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
10 changes: 6 additions & 4 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@ jobs:
make-docker-images:
strategy:
matrix:
postgres: [9.6, 10, 11, 12, 13, '14beta3']
postgres: [9.6, 10, 11, 12, 13, '14rc1']
postgis: ['2.5', '3.1']
variant: [default, alpine]
exclude:
- postgres: 12
postgis: '2.5'
- postgres: 13
postgis: '2.5'
- postgres: '14beta3'
- postgres: '14rc1'
postgis: '2.5'
include:
- postgres: 12
- postgres: 13
postgis: master
variant: default
- postgres: 13
- postgres: 14rc1
postgis: master
variant: default
name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
Expand Down
2 changes: 1 addition & 1 deletion 10-2.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:10
FROM postgres:10-stretch

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

Expand Down
4 changes: 2 additions & 2 deletions 10-3.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM postgres:10
FROM postgres:10-bullseye

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

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

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
2 changes: 1 addition & 1 deletion 11-2.5/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:11
FROM postgres:11-stretch

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

Expand Down
4 changes: 2 additions & 2 deletions 11-3.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM postgres:11
FROM postgres:11-bullseye

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

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

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
18 changes: 0 additions & 18 deletions 12-2.5/Dockerfile
View file
Open in desktop

This file was deleted.

110 changes: 0 additions & 110 deletions 12-2.5/alpine/Dockerfile
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions 12-3.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM postgres:12
FROM postgres:12-bullseye

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

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

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
4 changes: 2 additions & 2 deletions 13-3.1/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM postgres:13
FROM postgres:13-bullseye

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

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

RUN apt-get update \
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
Expand Down
69 changes: 35 additions & 34 deletions 13-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# "experimental" ; only for testing!
# multi-stage dockerfile; minimal docker version >= 17.05
FROM postgres:13 as builder
FROM postgres:13-bullseye as builder

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

Expand All @@ -11,22 +11,21 @@ RUN set -ex \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
curl \
libboost-atomic1.67.0 \
libboost-chrono1.67.0 \
libboost-date-time1.67.0 \
libboost-filesystem1.67.0 \
libboost-program-options1.67.0 \
libboost-serialization1.67.0 \
libboost-system1.67.0 \
libboost-test1.67.0 \
libboost-thread1.67.0 \
libboost-timer1.67.0 \
libcgal13 \
libboost-atomic1.74.0 \
libboost-chrono1.74.0 \
libboost-date-time1.74.0 \
libboost-filesystem1.74.0 \
libboost-program-options1.74.0 \
libboost-serialization1.74.0 \
libboost-system1.74.0 \
libboost-test1.74.0 \
libboost-thread1.74.0 \
libboost-timer1.74.0 \
libcurl3-gnutls \
libexpat1 \
libgmp10 \
libgmpxx4ldbl \
libjson-c3 \
libjson-c5 \
libmpfr6 \
libprotobuf-c1 \
libtiff5 \
Expand Down Expand Up @@ -61,6 +60,9 @@ RUN set -ex \

# sfcgal
ENV SFCGAL_VERSION master
#current:
#ENV SFCGAL_GIT_HASH 815d5097f684dbc48b22041bf2047beab36df0a1
#reverted for the last working version
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5

RUN set -ex \
Expand All @@ -79,7 +81,7 @@ RUN set -ex \

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f

RUN set -ex \
&& cd /usr/src \
Expand All @@ -95,7 +97,7 @@ RUN set -ex \

# geos
ENV GEOS_VERSION master
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b

RUN set -ex \
&& cd /usr/src \
Expand All @@ -112,7 +114,7 @@ RUN set -ex \

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38

RUN set -ex \
&& cd /usr/src \
Expand All @@ -138,28 +140,27 @@ RUN set -ex \
&& sfcgal-config --version \
&& pcre-config --version

FROM postgres:13
FROM postgres:13-bullseye

RUN set -ex \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
curl \
libboost-atomic1.67.0 \
libboost-chrono1.67.0 \
libboost-date-time1.67.0 \
libboost-filesystem1.67.0 \
libboost-program-options1.67.0 \
libboost-serialization1.67.0 \
libboost-system1.67.0 \
libboost-test1.67.0 \
libboost-thread1.67.0 \
libboost-timer1.67.0 \
libcgal13 \
libboost-atomic1.74.0 \
libboost-chrono1.74.0 \
libboost-date-time1.74.0 \
libboost-filesystem1.74.0 \
libboost-program-options1.74.0 \
libboost-serialization1.74.0 \
libboost-system1.74.0 \
libboost-test1.74.0 \
libboost-thread1.74.0 \
libboost-timer1.74.0 \
libcurl3-gnutls \
libexpat1 \
libgmp10 \
libgmpxx4ldbl \
libjson-c3 \
libjson-c5 \
libmpfr6 \
libpcre3 \
libprotobuf-c1 \
Expand All @@ -170,10 +171,10 @@ RUN set -ex \

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

ENV SFCGAL_GIT_HASH 495719bb7969973f322fea7de1c0982c4ebbdec8
ENV PROJ_GIT_HASH 7ea1338d8cd5a8b738c0fba69dbe8a9188ae3a95
ENV GEOS_GIT_HASH 5bb0eba2b33b924440b356334540e64b60c86201
ENV GDAL_GIT_HASH a54ad87bda6fcde20b158b85a40d61c5e2fd0a29
#ENV SFCGAL_GIT_HASH 815d5097f684dbc48b22041bf2047beab36df0a1
ENV PROJ_GIT_HASH 35fe5da17d67f793336decbc6e9280fe8f26ca8f
ENV GEOS_GIT_HASH d107fccbdffb127af3b571a8f238e700a725984b
ENV GDAL_GIT_HASH d3f2a360f3f21b85df8ed4c580914248ade7cc38

# Minimal command line test.
RUN set -ex \
Expand All @@ -187,7 +188,7 @@ RUN set -ex \

# install postgis
ENV POSTGIS_VERSION master
ENV POSTGIS_GIT_HASH 6f9f76b7395f5c27c69c2136c53608e44ba0d38f
ENV POSTGIS_GIT_HASH 0568b9c6c628ac55c643cd017c8edb5315718d7c

RUN set -ex \
&& apt-get update \
Expand Down
Loading