From c4a1eb9413cb7804aa5d5ec683adb06d9c87e09a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 20:43:38 +0000 Subject: [PATCH 1/2] CI(deps): Update ubuntu Docker tag to v26 --- Dockerfile | 2 +- docker/ubuntu/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ac0c3deb50..443d75b7eca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # Changes to this file must be copied over to the other file. ARG GUI=without -FROM ubuntu:24.04@sha256:786a8b558f7be160c6c8c4a54f9a57274f3b4fb1491cf65146521ae77ff1dc54 AS common_start +FROM ubuntu:26.04@sha256:53958ec7b67c2c9355df922dd08dbf0360611f8c3cdb656875e81873db9ffdba AS common_start ARG BASE_NAME="ubuntu:24.04" ARG PYTHON_VERSION=3.12 diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 2ac0c3deb50..443d75b7eca 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -4,7 +4,7 @@ # Changes to this file must be copied over to the other file. ARG GUI=without -FROM ubuntu:24.04@sha256:786a8b558f7be160c6c8c4a54f9a57274f3b4fb1491cf65146521ae77ff1dc54 AS common_start +FROM ubuntu:26.04@sha256:53958ec7b67c2c9355df922dd08dbf0360611f8c3cdb656875e81873db9ffdba AS common_start ARG BASE_NAME="ubuntu:24.04" ARG PYTHON_VERSION=3.12 From 3192a51267f83495a64646af6904e1765708cfaa Mon Sep 17 00:00:00 2001 From: Stefan Blumentrath Date: Tue, 23 Jun 2026 13:40:31 +0200 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Stefan Blumentrath --- docker/ubuntu/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/ubuntu/Dockerfile b/docker/ubuntu/Dockerfile index 443d75b7eca..eace891d972 100644 --- a/docker/ubuntu/Dockerfile +++ b/docker/ubuntu/Dockerfile @@ -45,7 +45,7 @@ ARG GRASS_RUN_PACKAGES="\ gcc \ git \ language-pack-en-base \ - libarmadillo12 \ + libarmadillo15 \ libcairo2 \ libcurl4-gnutls-dev \ libfftw3-bin \ @@ -55,7 +55,7 @@ ARG GRASS_RUN_PACKAGES="\ libgeotiff5 \ libgif7 \ libgsl-dev \ - libgsl27 \ + libgsl28 \ libhdf5-dev \ libjpeg-turbo8 \ libjson-c5 \