Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-20250811
ARG DEBIAN_RELEASE=trixie-20250811
FROM debian:"${DEBIAN_RELEASE}"-slim AS jre-build

SHELL ["/bin/bash", "-e", "-u", "-o", "pipefail", "-c"]
Expand Down Expand Up @@ -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/^/#/'
Expand Down
6 changes: 3 additions & 3 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ variable "JAVA21_VERSION" {
}

variable "DEBIAN_RELEASE" {
default = "bookworm-20250811"
default = "trixie-20250811"
}

# Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function
Expand Down Expand Up @@ -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}",
]
Expand Down
16 changes: 8 additions & 8 deletions updatecli/updatecli.d/debian.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: Bump Debian Bookworm version
name: Bump Debian Trixie version

scms:
default:
Expand All @@ -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:
Expand All @@ -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
Expand All @@ -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