Skip to content

Commit

Permalink
Dockerfile.master.template SFCGAL / PROJ refactoring. (#337)
Browse files Browse the repository at this point in the history
* 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"
  • Loading branch information
ImreSamu authored Feb 20, 2023
1 parent 4b53c95 commit 9f1f1ba
Show file tree
Hide file tree
Showing 19 changed files with 516 additions and 114 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

steps:
- name: Checkout source
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Build docker image for ${{ env.VERSION }} ${{ env.VARIANT }}
run: make test
Expand Down
4 changes: 4 additions & 0 deletions 11-3.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:11-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net"
Expand Down
4 changes: 4 additions & 0 deletions 11-3.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:11-alpine3.17

LABEL maintainer="PostGIS Project - https://postgis.net"
Expand Down
4 changes: 4 additions & 0 deletions 12-3.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:12-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net"
Expand Down
4 changes: 4 additions & 0 deletions 12-3.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:12-alpine3.17

LABEL maintainer="PostGIS Project - https://postgis.net"
Expand Down
4 changes: 4 additions & 0 deletions 13-3.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:13-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net"
Expand Down
4 changes: 4 additions & 0 deletions 13-3.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:13-alpine3.17

LABEL maintainer="PostGIS Project - https://postgis.net"
Expand Down
4 changes: 4 additions & 0 deletions 14-3.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:14-bullseye

LABEL maintainer="PostGIS Project - https://postgis.net"
Expand Down
4 changes: 4 additions & 0 deletions 14-3.3/alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#
# NOTE: THIS DOCKERFILE IS GENERATED VIA "make update"! PLEASE DO NOT EDIT IT DIRECTLY.
#

FROM postgres:14-alpine3.17

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

0 comments on commit 9f1f1ba

Please sign in to comment.