Skip to content

Commit a017ab8

Browse files
authored
Merge branch 'main' into dependabot/docker/dockerfiles/maven/jenkins/ssh-agent-7.0.0-jdk21
2 parents 6625d6a + ee19b13 commit a017ab8

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
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.90.0
26+
uses: updatecli/updatecli-action@v2.91.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

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.24.0-jdk21
66+
image: jenkins/ssh-agent:7.0.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:6.24.0-jdk21
124+
image: jenkins/ssh-agent:7.0.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:6.24.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.0.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.24.0-jdk21
1+
FROM jenkins/ssh-agent:7.0.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:6.24.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.0.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.24.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.0.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:6.24.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.0.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ font-awesome-api:7.0.0-851.vd1feb_218a_a_63
2121
git-client:6.3.2
2222
git:5.7.0
2323
github-api:1.321-488.v9b_c0da_9533f8
24-
github-branch-source:1844.v4a_9883d49126
24+
github-branch-source:1848.v42f74f7f4500
2525
github:1.44.0
2626
gradle:2.16.1149.v711b_998b_0532
2727
instance-identity:203.v15e81a_1b_7a_38

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.24.0-jdk21 as ssh-agent
4+
FROM jenkins/ssh-agent:7.0.0-jdk21 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)