Alpine upgrade to 3.12 ; fix compile error ; update master, alpine (#200)

ImreSamu · web-flow · commit ea730d9fdcbd · 2020-06-29T18:29:10.000-04:00
* change Alpine to llvm10-dev ( upstream upgraded to Alpine 3.12 ) related upstream issue "Upgrade Alpine to 3.12" * docker-library/postgres#742 * update.sh: refresh Dockerfiles ( alpine , master )
diff --git a/10-2.5/alpine/Dockerfile b/10-2.5/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/10-3.0/alpine/Dockerfile b/10-3.0/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/11-2.5/alpine/Dockerfile b/11-2.5/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/11-3.0/alpine/Dockerfile b/11-3.0/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/12-2.5/alpine/Dockerfile b/12-2.5/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/12-3.0/alpine/Dockerfile b/12-3.0/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/12-master/Dockerfile b/12-master/Dockerfile
@@ -3,15 +3,15 @@ FROM postgres:12
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV SFCGAL_VERSION master
-ENV SFCGAL_GIT_HASH 929605c8ea85f2c01efa116e1ed0eb01d285ea09
+ENV SFCGAL_GIT_HASH 4ab0dcf6f36c178caefd64b7d0c443342e76b6b9
 ENV PROJ_VERSION master
-ENV PROJ_GIT_HASH 5d502d356e16ef81f481eb82dcdeba0ea3ab1f9e
+ENV PROJ_GIT_HASH 0a995bb4219f5cf882503c1eb884474fdce53d12
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 5adc1949498b536cc787920c99db965c20c03b69
+ENV GDAL_GIT_HASH 39111a0fe9b174302f67102bdd849e8290472d70
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH 099e74b3127348e1f8544ab279b609e2fdc6cc74
+ENV GEOS_GIT_HASH 19dc3b19338c2aded5197ca0e5a5456b028defbd
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH 16121bf7939891022824152c0ca095aeebbad2ed
+ENV POSTGIS_GIT_HASH 3334fd0675c98c79a6a8527a05fc0e8c4c371835
 
 RUN set -ex \
     && apt-get update \
diff --git a/13-master/Dockerfile b/13-master/Dockerfile
@@ -3,15 +3,15 @@ FROM postgres:13
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV SFCGAL_VERSION master
-ENV SFCGAL_GIT_HASH 929605c8ea85f2c01efa116e1ed0eb01d285ea09
+ENV SFCGAL_GIT_HASH 4ab0dcf6f36c178caefd64b7d0c443342e76b6b9
 ENV PROJ_VERSION master
-ENV PROJ_GIT_HASH 5d502d356e16ef81f481eb82dcdeba0ea3ab1f9e
+ENV PROJ_GIT_HASH 0a995bb4219f5cf882503c1eb884474fdce53d12
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 5adc1949498b536cc787920c99db965c20c03b69
+ENV GDAL_GIT_HASH 39111a0fe9b174302f67102bdd849e8290472d70
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH 099e74b3127348e1f8544ab279b609e2fdc6cc74
+ENV GEOS_GIT_HASH 19dc3b19338c2aded5197ca0e5a5456b028defbd
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH 16121bf7939891022824152c0ca095aeebbad2ed
+ENV POSTGIS_GIT_HASH 3334fd0675c98c79a6a8527a05fc0e8c4c371835
 
 RUN set -ex \
     && apt-get update \
diff --git a/9.5-2.5/alpine/Dockerfile b/9.5-2.5/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/9.5-3.0/alpine/Dockerfile b/9.5-3.0/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/9.6-2.5/alpine/Dockerfile b/9.6-2.5/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/9.6-3.0/alpine/Dockerfile b/9.6-3.0/alpine/Dockerfile
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template
@@ -36,7 +36,7 @@ RUN set -ex \
         gcc \
         gdal-dev \
         geos-dev \
-        llvm9-dev \
+        llvm10-dev \
         proj-dev \
         protobuf-c-dev \
     && cd /usr/src/postgis \
