Skip to content

Commit d70f618

Browse files
committed
Merge remote-tracking branch 'upstream/main' into run-dependabot
2 parents dd5f63f + be7491f commit d70f618

File tree

12 files changed

+19
-19
lines changed

12 files changed

+19
-19
lines changed

.github/workflows/updatecli.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
# This step installs Updatecli in the runner using the updatecli-action
2525
- name: Install Updatecli in the runner
26-
uses: updatecli/updatecli-action@v2.75.0
26+
uses: updatecli/updatecli-action@v2.76.0
2727

2828
# This step runs Updatecli in Dry Run mode
2929
# It uses the "diff" command of updatecli with the specified config and values files

.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-08-07-57-03
4+
FROM gitpod/workspace-full:2025-01-13-12-15-02
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.6.0
65+
image: jenkins/ssh-agent:6.7.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.6.0
111+
image: jenkins/ssh-agent:6.7.0
112112
container_name: desktop-jenkins_agent-1
113113
profiles:
114114
- 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.6.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.7.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.6.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.7.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.6.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.7.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.6.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.7.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.6.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.7.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
@@ -3,7 +3,7 @@ antisamy-markup-formatter:162.v0e6ec0fcfcf6
33
apache-httpcomponents-client-4-api:4.5.14-208.v438351942757
44
bootstrap5-api:5.3.3-1
55
bouncycastle-api:2.30.1.79-254.vfdb_814e7791e
6-
branch-api:2.1206.vd9f35001c95c
6+
branch-api:2.1208.vf528356feca_4
77
build-timeout:1.33
88
caffeine-api:3.1.8-133.v17b_1ff2e0599
99
checks-api:2.2.1
@@ -20,7 +20,7 @@ font-awesome-api:6.6.0-2
2020
git-client:6.1.0
2121
git:5.7.0
2222
github-api:1.321-478.vc9ce627ce001
23-
github-branch-source:1807.v50351eb_7dd13
23+
github-branch-source:1809.v088b_5f22c768
2424
github:1.40.0
2525
gradle:2.14
2626
instance-identity:201.vd2a_b_5a_468a_a_6
@@ -44,8 +44,8 @@ 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:382.vb_9a_27b_7b_ea_71
48-
pipeline-groovy-lib:745.vdf6077913de0
47+
pipeline-graph-view:401.v99b_6582132f4
48+
pipeline-groovy-lib:749.v70084559234a_
4949
pipeline-input-step:508.v584c0e9a_2177
5050
pipeline-milestone-step:119.vdfdc43fc3b_9a_
5151
pipeline-model-api:2.2218.v56d0cda_37c72
@@ -70,13 +70,13 @@ token-macro:400.v35420b_922dcb_
7070
trilead-api:2.147.vb_73cc728a_32e
7171
variant:60.v7290fc0eb_b_cd
7272
workflow-aggregator:600.vb_57cdd26fdd7
73-
workflow-api:1336.vee415d95c521
73+
workflow-api:1358.vfb_5780da_64cb_
7474
workflow-basic-steps:1058.vcb_fc1e3a_21a_9
7575
workflow-cps:4007.vd705fc76a_34e
76-
workflow-durable-task-step:1398.vf6c9e89e5988
77-
workflow-job:1476.v90f02a_225559
76+
workflow-durable-task-step:1400.v7a_fd50a_091de
77+
workflow-job:1496.v5b_18defc07f2
7878
workflow-multibranch:795.ve0cb_1f45ca_9a_
7979
workflow-scm-step:427.v4ca_6512e7df1
8080
workflow-step-api:678.v3ee58b_469476
81-
workflow-support:936.v9fa_77211ca_e1
81+
workflow-support:943.v8b_0d01a_7b_a_08
8282
ws-cleanup:0.48

0 commit comments

Comments
 (0)