Skip to content

Commit 80ab2a5

Browse files
authored
Merge branch 'jenkins-docs:main' into main
2 parents 1d647ff + 93e2273 commit 80ab2a5

File tree

11 files changed

+18
-18
lines changed

11 files changed

+18
-18
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-01-15-08-55-28
4+
FROM gitpod/workspace-full:2025-01-20-14-43-19
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
@@ -62,7 +62,7 @@ services:
6262
timeout: 10s
6363
retries: 5
6464
default_agent:
65-
image: jenkins/ssh-agent:6.7.0
65+
image: jenkins/ssh-agent:6.8.0
6666
container_name: desktop-jenkins_agent-1
6767
profiles:
6868
- default

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ services:
108108
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
109109
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
110110
default_agent:
111-
image: jenkins/ssh-agent:6.7.0
111+
image: jenkins/ssh-agent:6.8.0
112112
container_name: desktop-jenkins_agent-1
113113
profiles:
114114
- 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-20241223-slim as prepare-stage
4+
FROM debian:bookworm-20250113-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.7.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.8.0 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/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.7.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.8.0 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.7.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.8.0 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.7.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.8.0 as ssh-agent
22

33
ARG NODE_MAJOR=20
44

dockerfiles/node/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.7.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.8.0 as ssh-agent
22
ARG NODE_MAJOR=22
33

44
# ca-certificates because curl uses certificates from ca-certificates

dockerfiles/plugins.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apache-httpcomponents-client-4-api:4.5.14-208.v438351942757
44
bootstrap5-api:5.3.3-1
55
bouncycastle-api:2.30.1.80-256.vf98926042a_9b_
66
branch-api:2.1208.vf528356feca_4
7-
build-timeout:1.33
7+
build-timeout:1.35
88
caffeine-api:3.1.8-133.v17b_1ff2e0599
99
checks-api:2.2.1
1010
cloudbees-folder:6.980.v5a_cc0cb_25881
@@ -20,8 +20,8 @@ font-awesome-api:6.6.0-2
2020
git-client:6.1.1
2121
git:5.7.0
2222
github-api:1.321-478.vc9ce627ce001
23-
github-branch-source:1809.v088b_5f22c768
24-
github:1.40.0
23+
github-branch-source:1810.v913311241fa_9
24+
github:1.41.0
2525
gradle:2.14
2626
instance-identity:201.vd2a_b_5a_468a_a_6
2727
ionicons-api:74.v93d5eb_813d5f
@@ -34,17 +34,17 @@ jaxb:2.3.9-1
3434
jjwt-api:0.11.5-112.ve82dfb_224b_a_d
3535
jquery3-api:3.7.1-2
3636
junit:1312.v1a_235a_b_94a_31
37-
locale:549.v824602fe3393
37+
locale:560.vc5b_91b_3a_2b_68
3838
mailer:489.vd4b_25144138f
3939
matrix-auth:3.2.3
4040
matrix-project:845.vffd7fa_f27555
41-
metrics:4.2.21-458.vcf496cb_839e4
41+
metrics:4.2.21-461.v881e35d8fa_b_a_
4242
mina-sshd-api-common:2.14.0-138.v6341ee58e1df
4343
mina-sshd-api-core:2.14.0-138.v6341ee58e1df
4444
okhttp-api:4.11.0-183.va_87fc7a_89810
4545
pipeline-build-step:540.vb_e8849e1a_b_d8
4646
pipeline-graph-analysis:216.vfd8b_ece330ca_
47-
pipeline-graph-view:401.v99b_6582132f4
47+
pipeline-graph-view:402.va_9d108235846
4848
pipeline-groovy-lib:749.v70084559234a_
4949
pipeline-input-step:508.v584c0e9a_2177
5050
pipeline-milestone-step:119.vdfdc43fc3b_9a_
@@ -77,6 +77,6 @@ workflow-durable-task-step:1400.v7a_fd50a_091de
7777
workflow-job:1498.v33a_0c6f3a_4b_4
7878
workflow-multibranch:795.ve0cb_1f45ca_9a_
7979
workflow-scm-step:427.v4ca_6512e7df1
80-
workflow-step-api:678.v3ee58b_469476
81-
workflow-support:943.v8b_0d01a_7b_a_08
80+
workflow-step-api:683.va_885a_76415f9
81+
workflow-support:944.v5a_859593b_98a_
8282
ws-cleanup:0.48

0 commit comments

Comments
 (0)