Skip to content

Commit a2a447f

Browse files
committed
improve alpine template & make update
1 parent 4503e0e commit a2a447f

File tree

9 files changed

+15
-8
lines changed

9 files changed

+15
-8
lines changed

10-3.2/alpine/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux \
105105
# for the buildx/qemu workflow
106106
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
107107
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
108+
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
108109
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
109110
&& su postgres -c 'psql -c "SHOW JIT;"' \
110111
; \

11-3.3/alpine/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux \
105105
# for the buildx/qemu workflow
106106
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
107107
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
108+
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
108109
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
109110
&& su postgres -c 'psql -c "SHOW JIT;"' \
110111
; \

12-3.3/alpine/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux \
105105
# for the buildx/qemu workflow
106106
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
107107
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
108+
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
108109
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
109110
&& su postgres -c 'psql -c "SHOW JIT;"' \
110111
; \

13-3.3/alpine/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux \
105105
# for the buildx/qemu workflow
106106
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
107107
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
108+
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
108109
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
109110
&& su postgres -c 'psql -c "SHOW JIT;"' \
110111
; \

14-3.3/alpine/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux \
105105
# for the buildx/qemu workflow
106106
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
107107
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
108+
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
108109
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
109110
&& su postgres -c 'psql -c "SHOW JIT;"' \
110111
; \

14-master/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
85+
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107
8686

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

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
134+
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -210,9 +210,9 @@ RUN set -ex \
210210
COPY --from=builder /usr/local /usr/local
211211

212212
#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
213-
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
213+
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107
214214
ENV GEOS_GIT_HASH cc667261086d8e5f9906b69f4feaea5112221e92
215-
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
215+
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5
216216

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

15-3.3/alpine/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux \
105105
# for the buildx/qemu workflow
106106
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
107107
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
108+
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
108109
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
109110
&& su postgres -c 'psql -c "SHOW JIT;"' \
110111
; \

15-master/Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -ex \
8282

8383
# proj
8484
ENV PROJ_VERSION master
85-
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
85+
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107
8686

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

132132
# gdal
133133
ENV GDAL_VERSION master
134-
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
134+
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5
135135

136136
RUN set -ex \
137137
&& cd /usr/src \
@@ -210,9 +210,9 @@ RUN set -ex \
210210
COPY --from=builder /usr/local /usr/local
211211

212212
#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
213-
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
213+
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107
214214
ENV GEOS_GIT_HASH cc667261086d8e5f9906b69f4feaea5112221e92
215-
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
215+
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5
216216

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

Dockerfile.alpine.template

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ RUN set -eux \
105105
# for the buildx/qemu workflow
106106
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
107107
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
108+
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
108109
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
109110
&& su postgres -c 'psql -c "SHOW JIT;"' \
110111
; \

0 commit comments

Comments
 (0)