Skip to content

Commit da89e08

Browse files
ImreSamuImreSamu
committed
make update
1 parent 0420c61 commit da89e08

File tree

15 files changed

+186
-30
lines changed

15 files changed

+186
-30
lines changed

‎10-3.2/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
66
ENV POSTGIS_VERSION 3.2.3+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
9+
\
10+
# buildx debug info
11+
&& uname -a \
12+
&& uname -m \
13+
&& lscpu \
14+
\
915
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1016
&& apt-get install -y --no-install-recommends \
1117
# ca-certificates: for accessing remote raster files;

‎10-3.2/alpine/Dockerfile

+21-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,31 @@ RUN set -eux \
9090
&& make -j$(nproc) \
9191
&& make install \
9292
\
93+
# buildx platform check for debug.
94+
&& uname -a \
95+
&& uname -m \
96+
&& cat /proc/cpuinfo \
97+
\
9398
# regress check
9499
&& mkdir /tempdb \
95100
&& chown -R postgres:postgres /tempdb \
96101
&& su postgres -c 'pg_ctl -D /tempdb init' \
97-
&& su postgres -c 'pg_ctl -D /tempdb start' \
102+
\
103+
&& if [ "10" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
117+
\
98118
&& cd regress \
99119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
100120
#&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \

‎11-3.3/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
66
ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
9+
\
10+
# buildx debug info
11+
&& uname -a \
12+
&& uname -m \
13+
&& lscpu \
14+
\
915
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1016
&& apt-get install -y --no-install-recommends \
1117
# ca-certificates: for accessing remote raster files;

‎11-3.3/alpine/Dockerfile

+21-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,31 @@ RUN set -eux \
9090
&& make -j$(nproc) \
9191
&& make install \
9292
\
93+
# buildx platform check for debug.
94+
&& uname -a \
95+
&& uname -m \
96+
&& cat /proc/cpuinfo \
97+
\
9398
# regress check
9499
&& mkdir /tempdb \
95100
&& chown -R postgres:postgres /tempdb \
96101
&& su postgres -c 'pg_ctl -D /tempdb init' \
97-
&& su postgres -c 'pg_ctl -D /tempdb start' \
102+
\
103+
&& if [ "11" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
117+
\
98118
&& cd regress \
99119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
100120
#&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \

‎12-3.3/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
66
ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
9+
\
10+
# buildx debug info
11+
&& uname -a \
12+
&& uname -m \
13+
&& lscpu \
14+
\
915
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1016
&& apt-get install -y --no-install-recommends \
1117
# ca-certificates: for accessing remote raster files;

‎12-3.3/alpine/Dockerfile

+21-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,31 @@ RUN set -eux \
9090
&& make -j$(nproc) \
9191
&& make install \
9292
\
93+
# buildx platform check for debug.
94+
&& uname -a \
95+
&& uname -m \
96+
&& cat /proc/cpuinfo \
97+
\
9398
# regress check
9499
&& mkdir /tempdb \
95100
&& chown -R postgres:postgres /tempdb \
96101
&& su postgres -c 'pg_ctl -D /tempdb init' \
97-
&& su postgres -c 'pg_ctl -D /tempdb start' \
102+
\
103+
&& if [ "12" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
117+
\
98118
&& cd regress \
99119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
100120
#&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \

‎13-3.3/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
66
ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
9+
\
10+
# buildx debug info
11+
&& uname -a \
12+
&& uname -m \
13+
&& lscpu \
14+
\
915
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1016
&& apt-get install -y --no-install-recommends \
1117
# ca-certificates: for accessing remote raster files;

‎13-3.3/alpine/Dockerfile

+21-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,31 @@ RUN set -eux \
9090
&& make -j$(nproc) \
9191
&& make install \
9292
\
93+
# buildx platform check for debug.
94+
&& uname -a \
95+
&& uname -m \
96+
&& cat /proc/cpuinfo \
97+
\
9398
# regress check
9499
&& mkdir /tempdb \
95100
&& chown -R postgres:postgres /tempdb \
96101
&& su postgres -c 'pg_ctl -D /tempdb init' \
97-
&& su postgres -c 'pg_ctl -D /tempdb start' \
102+
\
103+
&& if [ "13" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
117+
\
98118
&& cd regress \
99119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
100120
#&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \

‎13-master/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -ex \
6262
# sfcgal
6363
ENV SFCGAL_VERSION master
6464
#current:
65-
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
65+
#ENV SFCGAL_GIT_HASH 4fe14ed53ac9e9c4d601be3e2650f4d4b34b0cf6
6666
#reverted for the last working version
6767
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6868

@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 137caf78a2498abade88951dddc999dd5089e268
85+
ENV PROJ_GIT_HASH 75a0a556d93dfdb9c6a16dbccca757ee1d5ffc29
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
114114

115115
# geos
116116
ENV GEOS_VERSION master
117-
ENV GEOS_GIT_HASH 8aaed5e0905009a9ce1a77edc6b1e5378476f282
117+
ENV GEOS_GIT_HASH 64d8434d24eda3bbaa0cd12605d07273cef05eec
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 4de8becdd4ff4d656c3d7f8ab2cf3baa2a5005b9
134+
ENV GDAL_GIT_HASH 8e4c84b5103a832f5f0ca507ce2eec36f479f994
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -209,10 +209,10 @@ RUN set -ex \
209209

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

212-
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
213-
ENV PROJ_GIT_HASH 137caf78a2498abade88951dddc999dd5089e268
214-
ENV GEOS_GIT_HASH 8aaed5e0905009a9ce1a77edc6b1e5378476f282
215-
ENV GDAL_GIT_HASH 4de8becdd4ff4d656c3d7f8ab2cf3baa2a5005b9
212+
#ENV SFCGAL_GIT_HASH 4fe14ed53ac9e9c4d601be3e2650f4d4b34b0cf6
213+
ENV PROJ_GIT_HASH 75a0a556d93dfdb9c6a16dbccca757ee1d5ffc29
214+
ENV GEOS_GIT_HASH 64d8434d24eda3bbaa0cd12605d07273cef05eec
215+
ENV GDAL_GIT_HASH 8e4c84b5103a832f5f0ca507ce2eec36f479f994
216216

217217
# Minimal command line test.
218218
RUN set -ex \

‎14-3.3/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
66
ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
9+
\
10+
# buildx debug info
11+
&& uname -a \
12+
&& uname -m \
13+
&& lscpu \
14+
\
915
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1016
&& apt-get install -y --no-install-recommends \
1117
# ca-certificates: for accessing remote raster files;

‎14-3.3/alpine/Dockerfile

+21-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,31 @@ RUN set -eux \
9090
&& make -j$(nproc) \
9191
&& make install \
9292
\
93+
# buildx platform check for debug.
94+
&& uname -a \
95+
&& uname -m \
96+
&& cat /proc/cpuinfo \
97+
\
9398
# regress check
9499
&& mkdir /tempdb \
95100
&& chown -R postgres:postgres /tempdb \
96101
&& su postgres -c 'pg_ctl -D /tempdb init' \
97-
&& su postgres -c 'pg_ctl -D /tempdb start' \
102+
\
103+
&& if [ "14" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
117+
\
98118
&& cd regress \
99119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
100120
#&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \

‎14-master/Dockerfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ RUN set -ex \
6262
# sfcgal
6363
ENV SFCGAL_VERSION master
6464
#current:
65-
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
65+
#ENV SFCGAL_GIT_HASH 4fe14ed53ac9e9c4d601be3e2650f4d4b34b0cf6
6666
#reverted for the last working version
6767
ENV SFCGAL_GIT_HASH e1f5cd801f8796ddb442c06c11ce8c30a7eed2c5
6868

@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH 137caf78a2498abade88951dddc999dd5089e268
85+
ENV PROJ_GIT_HASH 75a0a556d93dfdb9c6a16dbccca757ee1d5ffc29
8686

8787
RUN set -ex \
8888
&& cd /usr/src \
@@ -114,7 +114,7 @@ RUN set -ex \
114114

115115
# geos
116116
ENV GEOS_VERSION master
117-
ENV GEOS_GIT_HASH 8aaed5e0905009a9ce1a77edc6b1e5378476f282
117+
ENV GEOS_GIT_HASH 64d8434d24eda3bbaa0cd12605d07273cef05eec
118118

119119
RUN set -ex \
120120
&& cd /usr/src \
@@ -131,7 +131,7 @@ RUN set -ex \
131131

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 4de8becdd4ff4d656c3d7f8ab2cf3baa2a5005b9
134+
ENV GDAL_GIT_HASH 8e4c84b5103a832f5f0ca507ce2eec36f479f994
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -209,10 +209,10 @@ RUN set -ex \
209209

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

212-
#ENV SFCGAL_GIT_HASH 9801868bad3f8b97083dce24224fb2346f2f8c1f
213-
ENV PROJ_GIT_HASH 137caf78a2498abade88951dddc999dd5089e268
214-
ENV GEOS_GIT_HASH 8aaed5e0905009a9ce1a77edc6b1e5378476f282
215-
ENV GDAL_GIT_HASH 4de8becdd4ff4d656c3d7f8ab2cf3baa2a5005b9
212+
#ENV SFCGAL_GIT_HASH 4fe14ed53ac9e9c4d601be3e2650f4d4b34b0cf6
213+
ENV PROJ_GIT_HASH 75a0a556d93dfdb9c6a16dbccca757ee1d5ffc29
214+
ENV GEOS_GIT_HASH 64d8434d24eda3bbaa0cd12605d07273cef05eec
215+
ENV GDAL_GIT_HASH 8e4c84b5103a832f5f0ca507ce2eec36f479f994
216216

217217
# Minimal command line test.
218218
RUN set -ex \

‎15beta4-3.3/Dockerfile

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ ENV POSTGIS_MAJOR 3
66
ENV POSTGIS_VERSION 3.3.1+dfsg-1.pgdg110+1
77

88
RUN apt-get update \
9+
\
10+
# buildx debug info
11+
&& uname -a \
12+
&& uname -m \
13+
&& lscpu \
14+
\
915
&& apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
1016
&& apt-get install -y --no-install-recommends \
1117
# ca-certificates: for accessing remote raster files;

‎15beta4-3.3/alpine/Dockerfile

+21-1
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,31 @@ RUN set -eux \
9090
&& make -j$(nproc) \
9191
&& make install \
9292
\
93+
# buildx platform check for debug.
94+
&& uname -a \
95+
&& uname -m \
96+
&& cat /proc/cpuinfo \
97+
\
9398
# regress check
9499
&& mkdir /tempdb \
95100
&& chown -R postgres:postgres /tempdb \
96101
&& su postgres -c 'pg_ctl -D /tempdb init' \
97-
&& su postgres -c 'pg_ctl -D /tempdb start' \
102+
\
103+
&& if [ "15beta4" == "10" ]; then \
104+
set -eux \
105+
# pg ==10 : testing with huge_pages=off ---> for the buildx/qemu workflow
106+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -D /tempdb start' \
107+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
108+
; \
109+
else \
110+
set -eux \
111+
# pg >=11 : testing with jit=off , huge_pages=off ---> for the buildx/qemu workflow
112+
&& su postgres -c 'pg_ctl -o "--huge_pages=off" -o "--jit=off" -D /tempdb start' \
113+
&& su postgres -c 'psql -c "SHOW HUGE_PAGES;"' \
114+
&& su postgres -c 'psql -c "SHOW JIT;"' \
115+
; \
116+
fi \
117+
\
98118
&& cd regress \
99119
&& make -j$(nproc) check RUNTESTFLAGS=--extension PGUSER=postgres \
100120
#&& make -j$(nproc) check RUNTESTFLAGS=--dumprestore PGUSER=postgres \

0 commit comments

Comments
 (0)