Skip to content

Commit 3e3a543

Browse files
authored
Merge branch 'main' into update-plugins-2025/10/21/05/28/40
2 parents bfbf282 + 8d745af commit 3e3a543

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

build-docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ services:
6363
timeout: 10s
6464
retries: 5
6565
default_agent:
66-
image: jenkins/ssh-agent:7.2.0-jdk21
66+
image: jenkins/ssh-agent:7.3.0-jdk21
6767
container_name: desktop-jenkins_agent-1
6868
profiles:
6969
- default

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ services:
121121
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
122122
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
123123
default_agent:
124-
image: jenkins/ssh-agent:7.2.0-jdk21
124+
image: jenkins/ssh-agent:7.3.0-jdk21
125125
container_name: desktop-jenkins_agent-1
126126
profiles:
127127
- default

dockerfiles/cpp/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM jenkins/ssh-agent:7.2.0-jdk21
1+
FROM jenkins/ssh-agent:7.3.0-jdk21
22

33
# Install necessary C++ build tools
44
RUN apt-get update && apt-get install -y --no-install-recommends \

dockerfiles/sidekick/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile is used to prepare a Debian-based Docker image with several utilities installed.
22

33
# We start from the Debian 'trixie' image.
4-
FROM debian:trixie-20250929 as prepare-stage
4+
FROM debian:trixie-20251020 as prepare-stage
55

66
# Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
77
COPY *sh /usr/local/bin/

0 commit comments

Comments
 (0)