From ca6b4bff700b15bfeb080e2e79c4c20f66edfc42 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 21 Aug 2025 08:40:55 +0000 Subject: [PATCH 1/6] Update Debian base to Trixie (13) LTS Change default Debian release from bookworm to trixie in docker-bake.hcl and debian/Dockerfile Ensure builds use the latest Debian LTS version --- debian/Dockerfile | 2 +- docker-bake.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 97ed09eb..1410126e 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -19,7 +19,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ARG DEBIAN_RELEASE=bookworm-20250721 +ARG DEBIAN_RELEASE=trixie-20250821 FROM debian:"${DEBIAN_RELEASE}"-slim AS jre-build SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"] diff --git a/docker-bake.hcl b/docker-bake.hcl index 0c287a03..5f4defdd 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -72,7 +72,7 @@ variable "JAVA21_VERSION" { } variable "DEBIAN_RELEASE" { - default = "bookworm-20250721" + default = "trixie-20250821" } # Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function From ee2f2191fbed486739ceae2f0ad8a46ecf8506e7 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 21 Aug 2025 10:51:25 +0200 Subject: [PATCH 2/6] fix(docker-bake): update JDK tags to use Trixie instead of Bookworm --- docker-bake.hcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 5f4defdd..754f3b46 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -179,10 +179,10 @@ target "debian" { equal(ON_TAG, "true") ? (is_default_jdk(jdk) ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}" : "") : "", # If the jdk is the default one, add latest short tag is_default_jdk(jdk) ? "${REGISTRY}/${JENKINS_REPO}:latest" : "", - "${REGISTRY}/${JENKINS_REPO}:bookworm-jdk${jdk}", + "${REGISTRY}/${JENKINS_REPO}:trixie-jdk${jdk}", "${REGISTRY}/${JENKINS_REPO}:debian-jdk${jdk}", "${REGISTRY}/${JENKINS_REPO}:jdk${jdk}", - "${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk${jdk}", + "${REGISTRY}/${JENKINS_REPO}:latest-trixie-jdk${jdk}", "${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk${jdk}", "${REGISTRY}/${JENKINS_REPO}:latest-jdk${jdk}", ] From 2b763d03f8fc4913e32b92fca74a5f29e527c17f Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 21 Aug 2025 10:58:44 +0200 Subject: [PATCH 3/6] chore(debian): update configuration to use Trixie instead of Bookworm --- updatecli/updatecli.d/debian.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/updatecli/updatecli.d/debian.yaml b/updatecli/updatecli.d/debian.yaml index d1a7e8a2..cad86bf9 100644 --- a/updatecli/updatecli.d/debian.yaml +++ b/updatecli/updatecli.d/debian.yaml @@ -1,5 +1,5 @@ --- -name: Bump Debian Bookworm version +name: Bump Debian Trixie version scms: default: @@ -14,22 +14,22 @@ scms: branch: "{{ .github.branch }}" sources: - bookwormLatestVersion: + trixieLatestVersion: kind: dockerimage - name: "Get the latest Debian Bookworm Linux version" + name: "Get the latest Debian Trixie Linux version" spec: image: "debian" - tagfilter: "bookworm-*" + tagfilter: "trixie-*" versionfilter: kind: regex pattern: >- - bookworm-\d+$ + trixie-\d+$ targets: updateDockerfile: name: "Update the value of the base image (ARG DEBIAN_RELEASE) in the Dockerfile" kind: dockerfile - sourceid: bookwormLatestVersion + sourceid: trixieLatestVersion spec: file: debian/Dockerfile instruction: @@ -39,7 +39,7 @@ targets: updateDockerBake: name: "Update the default value of the variable DEBIAN_RELEASE in the docker-bake.hcl" kind: hcl - sourceid: bookwormLatestVersion + sourceid: trixieLatestVersion spec: file: docker-bake.hcl path: variable.DEBIAN_RELEASE.default @@ -49,7 +49,7 @@ actions: default: kind: github/pullrequest scmid: default - title: Bump Debian Bookworm Linux version to {{ source "bookwormLatestVersion" }} + title: Bump Debian Trixie Linux version to {{ source "trixieLatestVersion" }} spec: labels: - dependencies From 3693a1bcd8cfbb6db2319c29ea7c94c5dc3fa5e2 Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 21 Aug 2025 11:01:06 +0200 Subject: [PATCH 4/6] fix(docker-bake): update Debian release date to 20250811 --- debian/Dockerfile | 2 +- docker-bake.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 1410126e..92dd96e3 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -19,7 +19,7 @@ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. -ARG DEBIAN_RELEASE=trixie-20250821 +ARG DEBIAN_RELEASE=trixie-20250811 FROM debian:"${DEBIAN_RELEASE}"-slim AS jre-build SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"] diff --git a/docker-bake.hcl b/docker-bake.hcl index 754f3b46..11ced17e 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -72,7 +72,7 @@ variable "JAVA21_VERSION" { } variable "DEBIAN_RELEASE" { - default = "trixie-20250821" + default = "trixie-20250811" } # Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function From 27bb5901a25bedd624ba0757ab47614d8fa9ebeb Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Thu, 21 Aug 2025 11:04:27 +0200 Subject: [PATCH 5/6] fix: /var/run/sshd already exists --- debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 92dd96e3..89bd0eec 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -99,7 +99,7 @@ RUN sed -i /etc/ssh/sshd_config \ -e 's/#PasswordAuthentication.*/PasswordAuthentication no/' \ -e 's/#SyslogFacility.*/SyslogFacility AUTH/' \ -e 's/#LogLevel.*/LogLevel INFO/' && \ - mkdir /var/run/sshd && \ + mkdir -p /var/run/sshd && \ sed -i /etc/pam.d/sshd \ -e 's/\(session\s*\)required\(\s*pam_loginuid.so\)/\1optional\2/' \ -e '/pam_motd/s/^/#/' From 13a379d7086c49d493a1ed5809641ee8190c4d2b Mon Sep 17 00:00:00 2001 From: Bruno Verachten Date: Mon, 1 Sep 2025 16:03:01 +0200 Subject: [PATCH 6/6] fix: Remove bookworm --- docker-bake.hcl | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 255fd9b0..11ced17e 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -73,7 +73,6 @@ variable "JAVA21_VERSION" { variable "DEBIAN_RELEASE" { default = "trixie-20250811" - default = "bookworm-20250811" } # Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function