Skip to content

Commit 7944a39

Browse files
authored
Merge branch 'main' into dependabot/github_actions/updatecli/updatecli-action-2.92.0
2 parents 84b4b1e + 2e3207c commit 7944a39

File tree

12 files changed

+12
-72
lines changed

12 files changed

+12
-72
lines changed

.github/workflows/codacy.yml

Lines changed: 0 additions & 60 deletions
This file was deleted.

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.0.0-jdk21
66+
image: jenkins/ssh-agent:7.1.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.0.0-jdk21
124+
image: jenkins/ssh-agent:7.1.0-jdk21
125125
container_name: desktop-jenkins_agent-1
126126
profiles:
127127
- 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:7.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.1.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:7.0.0-jdk21
1+
FROM jenkins/ssh-agent:7.1.0-jdk21
22

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

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:7.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.1.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:7.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.1.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:7.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.1.0-jdk21 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:7.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.1.0-jdk21 as ssh-agent
22
ARG NODE_MAJOR=22
33

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

dockerfiles/plugins.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ javax-mail-api:1.6.2-11
3434
jaxb:2.3.9-133.vb_ec76a_73f706
3535
jjwt-api:0.11.5-120.v0268cf544b_89
3636
jquery3-api:3.7.1-594.vb_3864f326cf0
37-
junit:1354.v5b_348580de7f
37+
junit:1355.v45e2ea_65863c
3838
locale:597.v7781ce70d4cf
3939
mailer:522.va_995fa_cfb_8b_d
4040
matrix-auth:3.2.8
@@ -45,7 +45,7 @@ mina-sshd-api-core:2.16.0-167.va_269f38cc024
4545
okhttp-api:4.11.0-189.v976fa_d3379d6
4646
pipeline-build-step:571.v08a_fffd4b_0ce
4747
pipeline-graph-analysis:241.vc3d48fb_b_2582
48-
pipeline-graph-view:628.va_6f6a_1d12848
48+
pipeline-graph-view:637.vb_6105ed84508
4949
pipeline-groovy-lib:752.vdddedf804e72
5050
pipeline-input-step:534.v352f0a_e98918
5151
pipeline-milestone-step:138.v78ca_76831a_43

0 commit comments

Comments
 (0)