Skip to content

Commit 0d4a8dc

Browse files
authored
Merge branch 'main' into dependabot/docker/dockerfiles/dotnet/jenkins/ssh-agent-8.1.0-jdk21
2 parents d28703b + 6978d96 commit 0d4a8dc

8 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/anchore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
run: cd ./dockerfiles/ && docker build . --file Dockerfile --tag localbuild/testimage:latest
3939

4040
- name: Run the Anchore Grype scan action
41-
uses: anchore/scan-action@7037fa011853d5a11690026fb85feee79f4c946c
41+
uses: anchore/scan-action@e1165082ffb1fe366ebaf02d8526e7c4989ea9d2
4242
id: scan
4343
with:
4444
path: "."

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.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:8.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/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:8.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:8.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:8.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:8.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:8.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:8.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:8.0.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:8.1.0-jdk21 as ssh-agent
22
ARG NODE_MAJOR=24
33

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

dockerfiles/plugins.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ commons-text-api:1.15.0-218.va_61573470393
1313
configuration-as-code:2053.vb_0da_47381a_25
1414
coverage:2.3139.v731d2e83ea_8a_
1515
credentials-binding:717.v951d49b_5f3a_a_
16-
credentials:1495.v2cc3d2266b_75
16+
credentials:1496.vf6821f162d4e
1717
display-url-api:2.217.va_6b_de84cc74b_
1818
durable-task:664.v2b_e7a_dfff66c
1919
echarts-api:6.0.0-1247.vf3e35a_c1813f
@@ -36,7 +36,7 @@ jjwt-api:0.11.5-120.v0268cf544b_89
3636
jquery3-api:3.7.1-619.vdb_10e002501a_
3737
junit:1403.vd9d1413fd205
3838
locale:614.va_6a_5a_1a_f2b_38
39-
mailer:525.v2458b_d8a_1a_71
39+
mailer:534.v1b_36f5864073
4040
matrix-auth:3.2.9
4141
matrix-project:870.v9db_fcfc2f45b_
4242
metrics:4.2.37-494.v06f9a_939d33a_
@@ -73,7 +73,7 @@ variant:70.va_d9f17f859e0
7373
workflow-aggregator:608.v67378e9d3db_1
7474
workflow-api:1398.v67030756d3fb_
7575
workflow-basic-steps:1098.v808b_fd7f8cf4
76-
workflow-cps:4259.vf653c2b_8a_b_69
76+
workflow-cps:4261.va_1fa_c7e4db_da_
7777
workflow-durable-task-step:1464.v2d3f5c68f84c
7878
workflow-job:1571.vb_423c255d6d9
7979
workflow-multibranch:821.vc3b_4ea_780798

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