Skip to content

Commit

Permalink
improve alpine template & make update
Browse files Browse the repository at this point in the history
  • Loading branch information
@ImreSamu
ImreSamu committed Oct 17, 2022
1 parent 4503e0e commit a2a447f
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 8 deletions.
1 change: 1 addition & 0 deletions 10-3.2/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux \
# for the buildx/qemu workflow
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
&& su postgres -c 'psql -c "SHOW JIT;"' \
; \
Expand Down
1 change: 1 addition & 0 deletions 11-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux \
# for the buildx/qemu workflow
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
&& su postgres -c 'psql -c "SHOW JIT;"' \
; \
Expand Down
1 change: 1 addition & 0 deletions 12-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux \
# for the buildx/qemu workflow
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
&& su postgres -c 'psql -c "SHOW JIT;"' \
; \
Expand Down
1 change: 1 addition & 0 deletions 13-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux \
# for the buildx/qemu workflow
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
&& su postgres -c 'psql -c "SHOW JIT;"' \
; \
Expand Down
1 change: 1 addition & 0 deletions 14-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux \
# for the buildx/qemu workflow
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
&& su postgres -c 'psql -c "SHOW JIT;"' \
; \
Expand Down
8 changes: 4 additions & 4 deletions 14-master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN set -ex \

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107

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

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5

RUN set -ex \
&& cd /usr/src \
Expand Down Expand Up @@ -210,9 +210,9 @@ RUN set -ex \
COPY --from=builder /usr/local /usr/local

#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107
ENV GEOS_GIT_HASH cc667261086d8e5f9906b69f4feaea5112221e92
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5

# Minimal command line test.
RUN set -ex \
Expand Down
1 change: 1 addition & 0 deletions 15-3.3/alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux \
# for the buildx/qemu workflow
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
&& su postgres -c 'psql -c "SHOW JIT;"' \
; \
Expand Down
8 changes: 4 additions & 4 deletions 15-master/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ RUN set -ex \

# proj
ENV PROJ_VERSION master
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107

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

# gdal
ENV GDAL_VERSION master
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5

RUN set -ex \
&& cd /usr/src \
Expand Down Expand Up @@ -210,9 +210,9 @@ RUN set -ex \
COPY --from=builder /usr/local /usr/local

#ENV SFCGAL_GIT_HASH df3c2ccc015d4a85ac672fc307d2c7c324cccca7
ENV PROJ_GIT_HASH e0911174c79bb14e46c4caf45c473c7b96ba56fa
ENV PROJ_GIT_HASH 1e9d92e31f81ae03f649a15442f7759238456107
ENV GEOS_GIT_HASH cc667261086d8e5f9906b69f4feaea5112221e92
ENV GDAL_GIT_HASH 373237978d077d447b6d95a3ca949b91e1deacda
ENV GDAL_GIT_HASH f30e88f6d8e58baf413fce281a8bc05fdb7087a5

# Minimal command line test.
RUN set -ex \
Expand Down
1 change: 1 addition & 0 deletions Dockerfile.alpine.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ RUN set -eux \
# for the buildx/qemu workflow
# with (aarch64 ppc64le) and PG>10 .. we are testing with JIT=OFF to avoid QEMU7.0/BUILDX error
&& echo "WARNING: JIT=OFF testing (aarch64 ppc64le)!" \
&& echo "## WARNING: tested with JIT=OFF (aarch64 ppc64le)!" >> /_pgis_full_version.txt \
&& su postgres -c 'pg_ctl -o "--jit=off" -D /tempdb start' \
&& su postgres -c 'psql -c "SHOW JIT;"' \
; \
Expand Down

0 comments on commit a2a447f

Please sign in to comment.