template refactoring ...

ImreSamu · ImreSamu · commit 6c60c3ed5076 · 2022-09-07T01:53:14.000+02:00
diff --git a/10-2.5/Dockerfile b/10-2.5/Dockerfile
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 2.5
 ENV POSTGIS_VERSION 2.5.5+dfsg-1.pgdg90+2
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/10-2.5/alpine/Dockerfile b/10-2.5/alpine/Dockerfile
@@ -90,11 +90,20 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -D /tempdb start' \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
+    && su postgres -c 'psql    -c "SHOW JIT;"' \
+    && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
+    \
     && cd regress \
     && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
     #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
diff --git a/10-3.2/Dockerfile b/10-3.2/Dockerfile
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
 ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/10-3.2/alpine/Dockerfile b/10-3.2/alpine/Dockerfile
@@ -90,11 +90,20 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -D /tempdb start' \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
+    && su postgres -c 'psql    -c "SHOW JIT;"' \
+    && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
+    \
     && cd regress \
     && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
     #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
diff --git a/11-2.5/Dockerfile b/11-2.5/Dockerfile
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 2.5
 ENV POSTGIS_VERSION 2.5.5+dfsg-1.pgdg90+2
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/11-2.5/alpine/Dockerfile b/11-2.5/alpine/Dockerfile
@@ -90,11 +90,20 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -D /tempdb start' \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
+    && su postgres -c 'psql    -c "SHOW JIT;"' \
+    && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
+    \
     && cd regress \
     && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
     #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
diff --git a/11-3.2/Dockerfile b/11-3.2/Dockerfile
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
 ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/11-3.2/alpine/Dockerfile b/11-3.2/alpine/Dockerfile
@@ -90,11 +90,20 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -D /tempdb start' \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
+    && su postgres -c 'psql    -c "SHOW JIT;"' \
+    && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
+    \
     && cd regress \
     && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
     #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
diff --git a/12-3.2/Dockerfile b/12-3.2/Dockerfile
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
 ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/12-3.2/alpine/Dockerfile b/12-3.2/alpine/Dockerfile
@@ -90,11 +90,20 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -D /tempdb start' \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
+    && su postgres -c 'psql    -c "SHOW JIT;"' \
+    && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
+    \
     && cd regress \
     && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
     #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
diff --git a/13-3.2/Dockerfile b/13-3.2/Dockerfile
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
 ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/13-3.2/alpine/Dockerfile b/13-3.2/alpine/Dockerfile
@@ -90,11 +90,20 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -D /tempdb start' \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
+    && su postgres -c 'psql    -c "SHOW JIT;"' \
+    && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
+    \
     && cd regress \
     && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
     #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
diff --git a/13-master/Dockerfile b/13-master/Dockerfile
@@ -114,7 +114,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
+ENV GEOS_GIT_HASH c68119c728487ce63ca125cc452e6f9217eee195
 
 RUN set -ex \
     && cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
 
 # gdal
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
+ENV GDAL_GIT_HASH 26752efb88cf6d9042614340f48ce97fde5ef281
 
 RUN set -ex \
     && cd /usr/src \
@@ -211,8 +211,8 @@ COPY --from=builder /usr/local /usr/local
 
 #ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
 ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
-ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
-ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
+ENV GEOS_GIT_HASH c68119c728487ce63ca125cc452e6f9217eee195
+ENV GDAL_GIT_HASH 26752efb88cf6d9042614340f48ce97fde5ef281
 
 # Minimal command line test.
 RUN set -ex \
@@ -230,7 +230,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
 
 # install postgis
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH d31888c038285d36b460e34773e5dddece27d585
+ENV POSTGIS_GIT_HASH 8e0c2bcdf56f4878d545aaf49d323308bc4856dc
 
 RUN set -ex \
     && apt-get update \
diff --git a/14-3.2/Dockerfile b/14-3.2/Dockerfile
@@ -1,16 +1,17 @@
 FROM postgres:14-bullseye
 
-RUN uname -a
-RUN uname -m
-RUN lscpu
-RUN cat /proc/cpuinfo
-
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
 ENV POSTGIS_MAJOR 3
 ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/14-3.2/alpine/Dockerfile b/14-3.2/alpine/Dockerfile
@@ -1,8 +1,4 @@
-FROM --platform= postgres:14-alpine3.16
-
-RUN uname -a
-RUN uname -m
-RUN cat /proc/cpuinfo
+FROM postgres:14-alpine3.16
 
 LABEL maintainer="PostGIS Project - https://postgis.net"
 
@@ -94,15 +90,18 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -o "--fsync=off" -o "--huge_pages=off" -o "--jit=off" -o "--synchronous_commit=off" -D /tempdb start' \
-    \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
     && su postgres -c 'psql    -c "SHOW JIT;"' \
-    && su postgres -c 'psql    -c "SHOW FSYNC;"' \
-    && su postgres -c 'psql    -c "SHOW SYNCHRONOUS_COMMIT;"' \
     && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
     \
     && cd regress \
@@ -141,4 +140,3 @@ RUN set -eux \
 
 COPY ./initdb-postgis.sh /docker-entrypoint-initdb.d/10_postgis.sh
 COPY ./update-postgis.sh /usr/local/bin
-
diff --git a/14-3.3.0rc2/alpine/Dockerfile b/14-3.3.0rc2/alpine/Dockerfile
@@ -90,11 +90,20 @@ RUN set -eux \
     && make -j$(nproc) \
     && make install \
     \
+# buildx platform check for debug.
+    && uname -a \
+    && uname -m \
+    && cat /proc/cpuinfo \
+    \
 # regress check
     && mkdir /tempdb \
     && chown -R postgres:postgres /tempdb \
     && su postgres -c 'pg_ctl -D /tempdb init' \
-    && su postgres -c 'pg_ctl -D /tempdb start' \
+    # testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
+    && su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
+    && su postgres -c 'psql    -c "SHOW JIT;"' \
+    && su postgres -c 'psql    -c "SHOW HUGE_PAGES;"' \
+    \
     && cd regress \
     && make -j$(nproc) check RUNTESTFLAGS=--extension   PGUSER=postgres \
     #&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \
diff --git a/14-master/Dockerfile b/14-master/Dockerfile
@@ -114,7 +114,7 @@ RUN set -ex \
 
 # geos
 ENV GEOS_VERSION master
-ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
+ENV GEOS_GIT_HASH c68119c728487ce63ca125cc452e6f9217eee195
 
 RUN set -ex \
     && cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
 
 # gdal
 ENV GDAL_VERSION master
-ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
+ENV GDAL_GIT_HASH 26752efb88cf6d9042614340f48ce97fde5ef281
 
 RUN set -ex \
     && cd /usr/src \
@@ -211,8 +211,8 @@ COPY --from=builder /usr/local /usr/local
 
 #ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
 ENV PROJ_GIT_HASH 4cc46f72bf6943592ce7c55f147a5a51a0a2992b
-ENV GEOS_GIT_HASH 7135b0014e554fa1ec3a35309920c077355a77d0
-ENV GDAL_GIT_HASH 0592a219d11e8da539f1bc0cc9c4ce8865a08818
+ENV GEOS_GIT_HASH c68119c728487ce63ca125cc452e6f9217eee195
+ENV GDAL_GIT_HASH 26752efb88cf6d9042614340f48ce97fde5ef281
 
 # Minimal command line test.
 RUN set -ex \
@@ -230,7 +230,7 @@ RUN ogr2ogr --formats | grep -q "PostgreSQL/PostGIS" && exit 0 \
 
 # install postgis
 ENV POSTGIS_VERSION master
-ENV POSTGIS_GIT_HASH d31888c038285d36b460e34773e5dddece27d585
+ENV POSTGIS_GIT_HASH 8e0c2bcdf56f4878d545aaf49d323308bc4856dc
 
 RUN set -ex \
     && apt-get update \
diff --git a/15beta3-3.2/Dockerfile b/15beta3-3.2/Dockerfile
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
 ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
 
 RUN apt-get update \
+      \
+      # buildx debug info
+      && uname -a \
+      && uname -m \
+      && lscpu \
+      \
       && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
       && apt-get install -y --no-install-recommends \
            # ca-certificates: for accessing remote raster files;
diff --git a/15beta3-3.2/alpine/Dockerfile b/15beta3-3.2/alpine/Dockerfile
diff --git a/15beta3-3.3.0rc2/alpine/Dockerfile b/15beta3-3.3.0rc2/alpine/Dockerfile
diff --git a/15beta3-master/Dockerfile b/15beta3-master/Dockerfile
diff --git a/Dockerfile.alpine.template b/Dockerfile.alpine.template
diff --git a/Dockerfile.template b/Dockerfile.template
