Skip to content

Commit 0f29ac8

Browse files
renovate[bot]echoixnetelernilason
authored
CI(deps): Update alpine Docker tag to v3.23 (releasebranch_8_4) (#6798)
* CI(deps): Update alpine Docker tag to v3.23 * docker(alpine): Update postgresql client to use postgresql18-client Was using postgresql15-client before, which is unavailable on that newer alpine version * docker(alpine): Fix casing of FROM ... AS (partial backport of 15731bc) Co-authored-by: neteler <1295172+neteler@users.noreply.github.com> * Partial backport of: "docker: hardcode versioned GISBASE path on Alpine (#5137)" Only the part adding the renovate update comment for GDAL-GRASS Co-authored-by: nilason <14186207+nilason@users.noreply.github.com> * docker(alpine): Fix casing of FROM ... AS --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Edouard Choinière <27212526+echoix@users.noreply.github.com> Co-authored-by: neteler <1295172+neteler@users.noreply.github.com> Co-authored-by: nilason <14186207+nilason@users.noreply.github.com>
1 parent ebf8869 commit 0f29ac8

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

docker/alpine/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.21@sha256:c3f8e73fdb79deaebaa2037150150191b9dcbfba68b4a46d70103204c53f4709 as common
1+
FROM alpine:3.23@sha256:25109184c71bdad752c8312a8623239686a9a2071e8825f20acb8f2198c3f659 AS common
22

33
# Based on:
44
# https://github.com/mundialis/docker-grass-gis/blob/master/Dockerfile
@@ -59,7 +59,7 @@ ENV GRASS_RUN_PACKAGES="\
5959
python3 \
6060
pdal \
6161
pdal-dev \
62-
postgresql15-client \
62+
postgresql18-client \
6363
proj-util \
6464
sqlite \
6565
sqlite-libs \
@@ -80,7 +80,7 @@ RUN echo "Install main packages";\
8080
apk add --no-cache $GRASS_RUN_PACKAGES
8181

8282

83-
FROM common as build
83+
FROM common AS build
8484

8585
# ================
8686
# CONFIG VARIABLES
@@ -168,6 +168,7 @@ RUN echo " => Configure and compile grass" && \
168168
ldconfig /etc/ld.so.conf.d
169169

170170
# Build the GDAL-GRASS plugin
171+
# renovate: datasource=github-tags depName=OSGeo/gdal-grass
171172
ARG GDAL_GRASS_VERSION=2.0.0
172173
RUN git clone --branch $GDAL_GRASS_VERSION --depth 1 https://github.com/OSGeo/gdal-grass.git /src/gdal-grass
173174
WORKDIR /src/gdal-grass
@@ -187,7 +188,8 @@ RUN cp /usr/local/grass/gui/wxpython/xml/module_items.xml module_items.xml; \
187188
mkdir -p /usr/local/grass/gui/wxpython/xml/; \
188189
mv module_items.xml /usr/local/grass/gui/wxpython/xml/module_items.xml;
189190

190-
FROM common as grass
191+
192+
FROM common AS grass
191193

192194
# GRASS GIS specific
193195
# allow work with MAPSETs that are not owned by current user

0 commit comments

Comments
 (0)