Skip to content

Lock alpine3.14 ( temporary fix for alpine 3.15 newer geos ) #272

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 2 commits into from
Dec 1, 2021
Merged

Lock alpine3.14 ( temporary fix for alpine 3.15 newer geos ) #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48cf656
lock alpine 3.14 for older geos (temp fix)
ImreSamu Nov 30, 2021
d3ff070
make update - regenerate templates
ImreSamu Nov 30, 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
2 changes: 1 addition & 1 deletion 10-2.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:10-alpine
FROM postgres:10-alpine3.14

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

Expand Down
2 changes: 1 addition & 1 deletion 10-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:10-alpine
FROM postgres:10-alpine3.14

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

Expand Down
2 changes: 1 addition & 1 deletion 11-2.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:11-alpine
FROM postgres:11-alpine3.14

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

Expand Down
2 changes: 1 addition & 1 deletion 11-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:11-alpine
FROM postgres:11-alpine3.14

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

Expand Down
2 changes: 1 addition & 1 deletion 12-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:12-alpine
FROM postgres:12-alpine3.14

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

Expand Down
2 changes: 1 addition & 1 deletion 13-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:13-alpine
FROM postgres:13-alpine3.14

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

Expand Down
18 changes: 9 additions & 9 deletions 13-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN set -ex \
# sfcgal
ENV SFCGAL_VERSION master
#current:
#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
#reverted for the last working version
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5

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

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd

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

# geos
ENV GEOS_VERSION master
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828

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

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f

RUN set -ex \
&& cd /usr/src \
Expand Down Expand Up @@ -179,10 +179,10 @@ RUN set -ex \

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

#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f

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

# install postgis
ENV POSTGIS_VERSION master
ENV POSTGIS_GIT_HASH 530f7c88cbebf8357650ad7f337a46f61c0dd214
ENV POSTGIS_GIT_HASH 27f44ecf69ac576c95ff649b2fb23aa3e1cce5c1

RUN set -ex \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion 14-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:14-alpine
FROM postgres:14-alpine3.14

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

Expand Down
18 changes: 9 additions & 9 deletions 14-master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ RUN set -ex \
# sfcgal
ENV SFCGAL_VERSION master
#current:
#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
#reverted for the last working version
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5

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

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd

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

# geos
ENV GEOS_VERSION master
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828

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

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f

RUN set -ex \
&& cd /usr/src \
Expand Down Expand Up @@ -179,10 +179,10 @@ RUN set -ex \

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

#ENV SFCGAL_GIT_HASH b1646552e77acccce74b26686a2e048a74caacb7
ENV PROJ_GIT_HASH ac882266b57d04720bb645b8144901127f7427cf
ENV GEOS_GIT_HASH 83d16f913eac72cccbe07c18033d6c1056bfbcee
ENV GDAL_GIT_HASH ab147114c2f1387447c3efc1a7ac7dfc3d7bad9a
#ENV SFCGAL_GIT_HASH 3c252a1b129203055b22b5d964e7fe39b136f014
ENV PROJ_GIT_HASH 7dc8a59217c41c8cfefe7f9d97cb7dae4a8b8fbd
ENV GEOS_GIT_HASH 17eaeb92920fca6183a916914ec3af11b84ae828
ENV GDAL_GIT_HASH 5b5042a388f0be78cdf1469eb6bb1c396aa0ec7f

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

# install postgis
ENV POSTGIS_VERSION master
ENV POSTGIS_GIT_HASH 530f7c88cbebf8357650ad7f337a46f61c0dd214
ENV POSTGIS_GIT_HASH 27f44ecf69ac576c95ff649b2fb23aa3e1cce5c1

RUN set -ex \
&& apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion 9.6-2.5/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:9.6-alpine
FROM postgres:9.6-alpine3.14

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

Expand Down
2 changes: 1 addition & 1 deletion 9.6-3.1/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:9.6-alpine
FROM postgres:9.6-alpine3.14

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

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.alpine.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM postgres:%%PG_MAJOR%%-alpine
FROM postgres:%%PG_MAJOR%%-alpine3.14

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

Expand Down