Skip to content

Commit

Permalink
Merge branch 'main' into update-plugins-2023/12/05/00/30/42
Browse files Browse the repository at this point in the history
  • Loading branch information
gounthar authored Dec 5, 2023
2 parents 5a6d33b + 7c3f58c commit 72a33bd
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/anchore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
run: cd ./dockerfiles/ && docker build . --file Dockerfile --tag localbuild/testimage:latest

- name: Run the Anchore Grype scan action
uses: anchore/scan-action@62370b53ab026f5d09b9fb43a7b5ec4b73c1a8e0
uses: anchore/scan-action@896d5f410043987c8fe18f60d91bf199e436840c
id: scan
with:
path: "."
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/label.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v4
- uses: actions/labeler@v5
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion .github/workflows/updatecli.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

# This step installs Updatecli in the runner using the updatecli-action
- name: Install Updatecli in the runner
uses: updatecli/updatecli-action@v2.49.1
uses: updatecli/updatecli-action@v2.50.0

# This step runs Updatecli in Dry Run mode
# It uses the "diff" command of updatecli with the specified config and values files
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/ssh-agent:5.20.0 as ssh-agent
FROM jenkins/ssh-agent:5.21.0 as ssh-agent

# ca-certificates because curl will need it later on for the maven installation
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/multi/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/ssh-agent:5.20.0 as ssh-agent
FROM jenkins/ssh-agent:5.21.0 as ssh-agent
# ca-certificates because curl will need it later on for the Maven installation
RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl && apt-get clean && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/node/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/ssh-agent:5.20.0 as ssh-agent
FROM jenkins/ssh-agent:5.21.0 as ssh-agent
ARG NODE_MAJOR=20

# ca-certificates because curl will need it later on for the node installation
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/python/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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.

# We start from the Jenkins SSH agent image version 5.20.0.
FROM jenkins/ssh-agent:5.20.0 as ssh-agent
FROM jenkins/ssh-agent:5.21.0 as ssh-agent

# The RUN command executes a series of commands in the new layer of the image and commits the results.
# The following commands are executed:
Expand Down

0 comments on commit 72a33bd

Please sign in to comment.