Skip to content

Commit b94e71e

Browse files
authored
Merge branch 'main' into dependabot/docker/dockerfiles/golang/jenkins/ssh-agent-7.5.0-jdk21
2 parents 498ec5c + 04648d3 commit b94e71e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

.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@a5605eb0943e46279cb4fbd9d44297355d3520ab
41+
uses: anchore/scan-action@568b89d27fc18c60e56937bff480c91c772cd993
4242
id: scan
4343
with:
4444
path: "."

.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.93.0
26+
uses: updatecli/updatecli-action@v2.94.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:7.3.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.4.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/plugins.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ plain-credentials:199.v9f8e1f741799
6060
plugin-util-api:6.1192.v30fe6e2837ff
6161
resource-disposer:0.25
6262
scm-api:712.v8846fdd68c88
63-
script-security:1378.vf25626395f49
63+
script-security:1385.v7d2d9ec4d909
6464
snakeyaml-api:2.5-143.v93b_c004f89de
6565
ssh-credentials:361.vb_f6760818e8c
6666
ssh-slaves:3.1085.vc64d040efa_85

0 commit comments

Comments
 (0)