Skip to content

Commit 04d8dc2

Browse files
authored
Merge branch 'main' into dependabot/docker/dockerfiles/multi/jenkins/ssh-agent-6.20.0-jdk21
2 parents 900cf84 + b640d09 commit 04d8dc2

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

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.19.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:6.20.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/dotnet/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.19.0-jdk21 AS ssh-agent
1+
FROM jenkins/ssh-agent:6.20.0-jdk21 AS ssh-agent
22

33
# install dotnet dependencies
44
RUN apt-get update && apt-get install -y --no-install-recommends libc6 libgcc1 libgssapi-krb5-2 libicu72 libssl3 libstdc++6 zlib1g wget && apt-get clean && \

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.19.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:6.20.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:6.19.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:6.20.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/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.19.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:6.20.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
@@ -45,7 +45,7 @@ mina-sshd-api-core:2.15.0-161.vb_200831a_c15b_
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:584.v32e797f976a_2
48+
pipeline-graph-view:588.v1efd7e219272
4949
pipeline-groovy-lib:752.vdddedf804e72
5050
pipeline-input-step:527.vd61b_1d3c5078
5151
pipeline-milestone-step:138.v78ca_76831a_43

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