Skip to content

Commit 9f1f1ba

Browse files
authored
Dockerfile.master.template SFCGAL / PROJ refactoring. (#337)
* Refactor SFCGAL build - using cgal 5.5.x-branch with header only build * small logging changes in master template * make update - regenerate templates * make update - refresh master templates * make update ; revert PROJ * make update ; revert Geos to "Commits on Jan 6, 2023" * revert proj, geos - for 2023week1 * make update * add temporary workaround for https://trac.osgeo.org/postgis/ticket/5316 * better workarounds: https://trac.osgeo.org/postgis/ticket/5316 * make update * make update * make update * improve Dockerfile.master.template * improvements in Dockerfile.master.template * update Dockerfile.master.template cgal commit * improve Dockerfile.master.template gdal * improve Dockerfile templates with ~ "autogenerated" text, and other improvements. * update to actions/checkout@v3 * "make update"
1 parent 4b53c95 commit 9f1f1ba

File tree

19 files changed

+516
-114
lines changed

19 files changed

+516
-114
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Checkout source
38-
uses: actions/checkout@v2
38+
uses: actions/checkout@v3
3939

4040
- name: Build docker image for ${{ env.VERSION }} ${{ env.VARIANT }}
4141
run: make test

11-3.3/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:11-bullseye
26

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

11-3.3/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:11-alpine3.17
26

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

12-3.3/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:12-bullseye
26

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

12-3.3/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:12-alpine3.17
26

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

13-3.3/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:13-bullseye
26

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

13-3.3/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:13-alpine3.17
26

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

14-3.3/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:14-bullseye
26

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

14-3.3/alpine/Dockerfile

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#
2+
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
3+
#
4+
15
FROM postgres:14-alpine3.17
26

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

0 commit comments

Comments
 (0)