Skip to content

Commit 9b4c706

Browse files
authored
Merge branch 'jenkins-docs:main' into main
2 parents f09332e + 47637ff commit 9b4c706

File tree

14 files changed

+24
-24
lines changed

14 files changed

+24
-24
lines changed

.gitpod/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 create a Gitpod workspace with GitHub CLI installed.
22

33
# We start from the Gitpod full workspace image which includes a broad range of development tools.
4-
FROM gitpod/workspace-full:2025-04-14-12-26-26
4+
FROM gitpod/workspace-full:2025-04-16-08-49-20
55

66
# The RUN command executes a series of commands in the new layer of the image and commits the results.
77
# The following commands are executed:

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:6.12.0-jdk21
66+
image: jenkins/ssh-agent:6.14.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
@@ -111,7 +111,7 @@ services:
111111
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
112112
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
113113
default_agent:
114-
image: jenkins/ssh-agent:6.12.0-jdk21
114+
image: jenkins/ssh-agent:6.14.0-jdk21
115115
container_name: desktop-jenkins_agent-1
116116
profiles:
117117
- default

dockerfiles/agent-discovery/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 'bookworm' image dated 2023-11-20.
4-
FROM debian:bookworm-20250407-slim as prepare-stage
4+
FROM debian:bookworm-20250428-slim 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/

dockerfiles/android/Dockerfile

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

33
# ca-certificates because curl uses certificates from ca-certificates
44
RUN apt-get update && apt-get install -y --no-install-recommends adb build-essential ca-certificates curl file git python3 python3-pip unzip

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:6.12.0-jdk21
1+
FROM jenkins/ssh-agent:6.14.0-jdk21
22

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

dockerfiles/dotnet/Dockerfile

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

33
# install dotnet dependencies
44
RUN apt-get update && apt-get install -y --no-install-recommends libc6 libgcc1 libgssapi-krb5-2 libicu72 libssl3 libstdc++6 zlib1g wget && apt-get clean && \

dockerfiles/golang/Dockerfile

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

33
# ca-certificates because curl uses certificates from ca-certificates
44
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \

dockerfiles/maven/Dockerfile

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

33
# ca-certificates because curl uses certificates from ca-certificates
44
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \

dockerfiles/multi/Dockerfile

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

33
ARG NODE_MAJOR=20
44

0 commit comments

Comments
 (0)