Skip to content

Commit 989d33c

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 5cef4cc + 28a80df commit 989d33c

File tree

16 files changed

+52
-52
lines changed

16 files changed

+52
-52
lines changed

.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.79.0
26+
uses: updatecli/updatecli-action@v2.82.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

.gitpod/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 Gitpod workspace with GitHub CLI installed.
22

33
# We start from the Gitpod full workspace image which includes a broad range of development tools.
4-
FROM gitpod/workspace-full:2025-03-18-13-03-22
4+
FROM gitpod/workspace-full:2025-04-14-12-26-26
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:

build-docker-compose.yaml

Lines changed: 3 additions & 3 deletions
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:6.10.0
66+
image: jenkins/ssh-agent:6.12.0
6767
container_name: desktop-jenkins_agent-1
6868
profiles:
6969
- default
@@ -234,14 +234,14 @@ services:
234234
jenkins_controller:
235235
condition: service_started
236236
ports:
237-
- "5000:5000"
237+
- "5000:5000"
238238
healthcheck:
239239
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
240240
interval: 5s
241241
timeout: 10s
242242
retries: 5
243243
volumes:
244-
- agent-ssh-dir:/home/jenkins/.ssh:ro
244+
- agent-ssh-dir:/home/jenkins/.ssh:ro
245245
volumes:
246246
jenkins_home: null
247247
agent-ssh-dir:

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ services:
111111
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
112112
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
113113
default_agent:
114-
image: jenkins/ssh-agent:6.10.0
114+
image: jenkins/ssh-agent:6.12.0
115115
container_name: desktop-jenkins_agent-1
116116
profiles:
117117
- default

dockerfiles/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 server with a specific version and pre-configured settings.
22

33
# We start by defining an ARG for the Jenkins version. This allows us to easily change the version of Jenkins we want to use.
4-
ARG JENKINS_VERSION=2.492.2
4+
ARG JENKINS_VERSION=2.492.3
55

66
# We then use the official Jenkins image with the specified version as our base image.
77
FROM jenkins/jenkins:"${JENKINS_VERSION}"

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 'bookworm' image dated 2023-11-20.
4-
FROM debian:bookworm-20250224-slim as prepare-stage
4+
FROM debian:bookworm-20250407-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:6.10.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.12.0 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:6.10.0
1+
FROM jenkins/ssh-agent:6.12.0
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:6.10.0 AS ssh-agent
1+
FROM jenkins/ssh-agent:6.12.0 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM jenkins/ssh-agent:6.10.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.12.0 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 && \
55
rm -rf /var/lib/apt/lists/*
66

77
# Now time to install golang
8-
ARG GOLANG_VERSION=1.24.1
8+
ARG GOLANG_VERSION=1.24.2
99
ARG TARGETARCH
1010
ENV ARCHITECTURE=$TARGETARCH
1111

0 commit comments

Comments
 (0)