Skip to content

Commit b52bad5

Browse files
authored
Merge branch 'main' into dependabot/docker/dockerfiles/multi/jenkins/ssh-agent-8.6.0-jdk21
2 parents 8201440 + 402a4b7 commit b52bad5

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

.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@v3.3.0
26+
uses: updatecli/updatecli-action@v3.4.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

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