Skip to content

Commit a6b0d70

Browse files
authored
Remove 12-3.5 since it is end of life (#404)
Remove 12-3.5 since it is end of life - git rm 12-3.5 -r - run update.sh - update README.md - Remove pg12 from github workflow ref: docker-library/postgres#1312
1 parent 0eb34a5 commit a6b0d70

File tree

10 files changed

+25
-285
lines changed

10 files changed

+25
-285
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
make-docker-images:
1616
strategy:
1717
matrix:
18-
postgres: [12, 13, 14, 15, 16, 17]
18+
postgres: [13, 14, 15, 16, 17]
1919
postgis: ['3.5']
2020
variant: [default, alpine]
2121
include:

12-3.5/Dockerfile

Lines changed: 0 additions & 28 deletions
This file was deleted.

12-3.5/alpine/Dockerfile

Lines changed: 0 additions & 124 deletions
This file was deleted.

12-3.5/alpine/initdb-postgis.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

12-3.5/alpine/update-postgis.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

12-3.5/initdb-postgis.sh

Lines changed: 0 additions & 25 deletions
This file was deleted.

12-3.5/update-postgis.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

16-master/Dockerfile

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ ENV DOCKER_CMAKE_BUILD_TYPE=${DOCKER_CMAKE_BUILD_TYPE}
8686
# cgal & sfcgal
8787
ARG CGAL_GIT_BRANCH
8888
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
89-
ENV CGAL_GIT_HASH c313da8791a99db984d4efcf061cde9a83d05418
90-
ENV SFCGAL_GIT_HASH 38d5c0f5af3eaf38998e53d959994a346deb1c64
89+
ENV CGAL_GIT_HASH b19515e1f82660c9709a2bd152991b8f85d3f411
90+
ENV SFCGAL_GIT_HASH a88742fe3c794e859c2b98e1f1daf030643ebdbf
9191
RUN set -ex \
9292
&& mkdir -p /usr/src \
9393
&& cd /usr/src \
@@ -120,7 +120,7 @@ RUN set -ex \
120120
&& rm -fr /usr/src/cgal
121121

122122
# proj
123-
ENV PROJ_GIT_HASH c34044742a5f0b67d12e613250601d1cbefcebbd
123+
ENV PROJ_GIT_HASH 8268efca12986e8d33c13cd42aa16ccbf14d86c1
124124
RUN set -ex \
125125
&& cd /usr/src \
126126
&& git clone https://github.com/OSGeo/PROJ.git \
@@ -150,7 +150,7 @@ RUN set -ex \
150150
&& rm -fr /usr/src/PROJ
151151

152152
# geos
153-
ENV GEOS_GIT_HASH b23952c3618c590c6e9c7c4e9816447090613975
153+
ENV GEOS_GIT_HASH b77f7fa6fb4161f3587eba1b6e7f00197ce46bc5
154154
RUN set -ex \
155155
&& cd /usr/src \
156156
&& git clone https://github.com/libgeos/geos.git \
@@ -166,7 +166,7 @@ RUN set -ex \
166166
&& rm -fr /usr/src/geos
167167

168168
# gdal
169-
ENV GDAL_GIT_HASH ae464d424efe00bc275478c0c8813aba309a0e56
169+
ENV GDAL_GIT_HASH 28c687a4bbf94522fd2424b007746763819c0ff4
170170
RUN set -ex \
171171
&& cd /usr/src \
172172
&& git clone https://github.com/OSGeo/gdal.git \
@@ -299,11 +299,11 @@ COPY --from=builder /usr/local /usr/local
299299

300300
ARG CGAL_GIT_BRANCH
301301
ENV CGAL_GIT_BRANCH=${CGAL_GIT_BRANCH}
302-
ENV CGAL_GIT_HASH c313da8791a99db984d4efcf061cde9a83d05418
303-
ENV SFCGAL_GIT_HASH 38d5c0f5af3eaf38998e53d959994a346deb1c64
304-
ENV PROJ_GIT_HASH c34044742a5f0b67d12e613250601d1cbefcebbd
305-
ENV GEOS_GIT_HASH b23952c3618c590c6e9c7c4e9816447090613975
306-
ENV GDAL_GIT_HASH ae464d424efe00bc275478c0c8813aba309a0e56
302+
ENV CGAL_GIT_HASH b19515e1f82660c9709a2bd152991b8f85d3f411
303+
ENV SFCGAL_GIT_HASH a88742fe3c794e859c2b98e1f1daf030643ebdbf
304+
ENV PROJ_GIT_HASH 8268efca12986e8d33c13cd42aa16ccbf14d86c1
305+
ENV GEOS_GIT_HASH b77f7fa6fb4161f3587eba1b6e7f00197ce46bc5
306+
ENV GDAL_GIT_HASH 28c687a4bbf94522fd2424b007746763819c0ff4
307307

308308
# Minimal command line test ( fail fast )
309309
RUN set -ex \
@@ -322,7 +322,7 @@ RUN set -ex \
322322
|| echo "ogr2ogr missing PostgreSQL driver" && exit 1
323323

324324
# install postgis
325-
ENV POSTGIS_GIT_HASH 607b81d5af061e4a8dd76ee68f3e601d87107a00
325+
ENV POSTGIS_GIT_HASH b98401af48b5372bf73ba27e4c4cfcc78ebd49d1
326326

327327
RUN set -ex \
328328
&& apt-get update \

0 commit comments

Comments
 (0)