Skip to content

Commit 96912e3

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 7a93639 + b415756 commit 96912e3

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
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:2024-11-11-13-51-43
4+
FROM gitpod/workspace-full:2024-11-20-08-19-55
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.1.0
65+
image: jenkins/ssh-agent:6.2.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
@@ -109,7 +109,7 @@ services:
109109
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
110110
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
111111
default_agent:
112-
image: jenkins/ssh-agent:6.1.0
112+
image: jenkins/ssh-agent:6.2.0
113113
container_name: desktop-jenkins_agent-1
114114
profiles:
115115
- default

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.1.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.2.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.1.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.2.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.1.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.2.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.1.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.2.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.1.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.2.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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ branch-api:2.1200.v4b_a_3da_2eb_db_4
77
build-timeout:1.33
88
caffeine-api:3.1.8-133.v17b_1ff2e0599
99
checks-api:2.2.1
10-
cloudbees-folder:6.955.v81e2a_35c08d3
10+
cloudbees-folder:6.959.v4ed5cc9e2dd4
1111
commons-lang3-api:3.17.0-84.vb_b_938040b_078
1212
commons-text-api:1.12.0-129.v99a_50df237f7
13-
configuration-as-code:1887.v9e47623cb_043
13+
configuration-as-code:1897.v79281e066ea_7
1414
credentials-binding:687.v619cb_15e923f
1515
credentials:1389.vd7a_b_f5fa_50a_2
1616
display-url-api:2.209.v582ed814ff2f
@@ -34,7 +34,7 @@ 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:1309.v0078b_fecd6ed
37-
locale:546.v1609030511ca_
37+
locale:549.v824602fe3393
3838
mailer:489.vd4b_25144138f
3939
matrix-auth:3.2.3
4040
matrix-project:840.v812f627cb_578
@@ -72,7 +72,7 @@ variant:60.v7290fc0eb_b_cd
7272
workflow-aggregator:600.vb_57cdd26fdd7
7373
workflow-api:1336.vee415d95c521
7474
workflow-basic-steps:1058.vcb_fc1e3a_21a_9
75-
workflow-cps:3993.v3e20a_37282f8
75+
workflow-cps:3996.va_f5c1799f978
7676
workflow-durable-task-step:1378.v6a_3e903058a_3
7777
workflow-job:1468.vcf4f5ee92395
7878
workflow-multibranch:795.ve0cb_1f45ca_9a_

dockerfiles/python/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 Jenkins SSH agent with Python and several Python packages installed in order to run the python sample tutorial.
22

33
# We start from the Jenkins SSH agent image version 5.20.0.
4-
FROM jenkins/ssh-agent:6.1.0 as ssh-agent
4+
FROM jenkins/ssh-agent:6.2.0 as ssh-agent
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:

0 commit comments

Comments
 (0)