Skip to content

Commit 620c9ba

Browse files
authored
Merge pull request #542 from gounthar/109-move-debian-to-trixie
Update Debian base to Trixie (13) LTS
2 parents be81948 + 13a379d commit 620c9ba

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

debian/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
# THE SOFTWARE.
22-
ARG DEBIAN_RELEASE=bookworm-20250811
22+
ARG DEBIAN_RELEASE=trixie-20250811
2323
FROM debian:"${DEBIAN_RELEASE}"-slim AS jre-build
2424

2525
SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
@@ -99,7 +99,7 @@ RUN sed -i /etc/ssh/sshd_config \
9999
-e 's/#PasswordAuthentication.*/PasswordAuthentication no/' \
100100
-e 's/#SyslogFacility.*/SyslogFacility AUTH/' \
101101
-e 's/#LogLevel.*/LogLevel INFO/' && \
102-
mkdir /var/run/sshd && \
102+
mkdir -p /var/run/sshd && \
103103
sed -i /etc/pam.d/sshd \
104104
-e 's/\(session\s*\)required\(\s*pam_loginuid.so\)/\1optional\2/' \
105105
-e '/pam_motd/s/^/#/'

docker-bake.hcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ variable "JAVA21_VERSION" {
7272
}
7373

7474
variable "DEBIAN_RELEASE" {
75-
default = "bookworm-20250811"
75+
default = "trixie-20250811"
7676
}
7777

7878
# Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function
@@ -179,10 +179,10 @@ target "debian" {
179179
equal(ON_TAG, "true") ? (is_default_jdk(jdk) ? "${REGISTRY}/${JENKINS_REPO}:${VERSION}" : "") : "",
180180
# If the jdk is the default one, add latest short tag
181181
is_default_jdk(jdk) ? "${REGISTRY}/${JENKINS_REPO}:latest" : "",
182-
"${REGISTRY}/${JENKINS_REPO}:bookworm-jdk${jdk}",
182+
"${REGISTRY}/${JENKINS_REPO}:trixie-jdk${jdk}",
183183
"${REGISTRY}/${JENKINS_REPO}:debian-jdk${jdk}",
184184
"${REGISTRY}/${JENKINS_REPO}:jdk${jdk}",
185-
"${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk${jdk}",
185+
"${REGISTRY}/${JENKINS_REPO}:latest-trixie-jdk${jdk}",
186186
"${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk${jdk}",
187187
"${REGISTRY}/${JENKINS_REPO}:latest-jdk${jdk}",
188188
]

updatecli/updatecli.d/debian.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Bump Debian Bookworm version
2+
name: Bump Debian Trixie version
33

44
scms:
55
default:
@@ -14,22 +14,22 @@ scms:
1414
branch: "{{ .github.branch }}"
1515

1616
sources:
17-
bookwormLatestVersion:
17+
trixieLatestVersion:
1818
kind: dockerimage
19-
name: "Get the latest Debian Bookworm Linux version"
19+
name: "Get the latest Debian Trixie Linux version"
2020
spec:
2121
image: "debian"
22-
tagfilter: "bookworm-*"
22+
tagfilter: "trixie-*"
2323
versionfilter:
2424
kind: regex
2525
pattern: >-
26-
bookworm-\d+$
26+
trixie-\d+$
2727
2828
targets:
2929
updateDockerfile:
3030
name: "Update the value of the base image (ARG DEBIAN_RELEASE) in the Dockerfile"
3131
kind: dockerfile
32-
sourceid: bookwormLatestVersion
32+
sourceid: trixieLatestVersion
3333
spec:
3434
file: debian/Dockerfile
3535
instruction:
@@ -39,7 +39,7 @@ targets:
3939
updateDockerBake:
4040
name: "Update the default value of the variable DEBIAN_RELEASE in the docker-bake.hcl"
4141
kind: hcl
42-
sourceid: bookwormLatestVersion
42+
sourceid: trixieLatestVersion
4343
spec:
4444
file: docker-bake.hcl
4545
path: variable.DEBIAN_RELEASE.default
@@ -49,7 +49,7 @@ actions:
4949
default:
5050
kind: github/pullrequest
5151
scmid: default
52-
title: Bump Debian Bookworm Linux version to {{ source "bookwormLatestVersion" }}
52+
title: Bump Debian Trixie Linux version to {{ source "trixieLatestVersion" }}
5353
spec:
5454
labels:
5555
- dependencies

0 commit comments

Comments
 (0)