Skip to content

Commit 7322a96

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 78c06b8 + 608598f commit 7322a96

File tree

15 files changed

+22
-22
lines changed

15 files changed

+22
-22
lines changed

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
"features": {
66
"ghcr.io/devcontainers/features/docker-in-docker:2": {
7-
"version": "28.5",
7+
"version": "2.82.1",
88
"dockerDashComposeVersion": "v2"
99
},
1010
"ghcr.io/devcontainers/features/github-cli:1": {

.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

build-docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ services:
6363
timeout: 10s
6464
retries: 5
6565
default_agent:
66-
image: jenkins/ssh-agent:7.3.0-jdk21
66+
image: jenkins/ssh-agent:7.5.0-jdk21
6767
container_name: desktop-jenkins_agent-1
6868
profiles:
6969
- default

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ services:
121121
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
122122
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
123123
default_agent:
124-
image: jenkins/ssh-agent:7.3.0-jdk21
124+
image: jenkins/ssh-agent:7.5.0-jdk21
125125
container_name: desktop-jenkins_agent-1
126126
profiles:
127127
- default

dockerfiles/agent-discovery/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 prepare a Debian-based Docker image with several utilities installed.
22

33
# We start from the Debian 'trixie' image.
4-
FROM debian:trixie-20250929-slim as prepare-stage
4+
FROM debian:trixie-20251020-slim as prepare-stage
55

66
# Copy all shell scripts from the current directory to /usr/local/bin/ in the image.
77
COPY *sh /usr/local/bin/

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.5.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/cpp/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
1+
FROM jenkins/ssh-agent:7.5.0-jdk21
22

33
# Install necessary C++ build tools
44
RUN apt-get update && apt-get install -y --no-install-recommends \

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:7.3.0-jdk21 AS ssh-agent
1+
FROM jenkins/ssh-agent:7.5.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:7.3.0-jdk21 as ssh-agent
1+
FROM jenkins/ssh-agent:7.5.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 && \

0 commit comments

Comments
 (0)