Skip to content

Commit 04f1287

Browse files
authored
Merge branch 'jenkins-docs:main' into main
2 parents c61e7a9 + 9d29ed7 commit 04f1287

File tree

12 files changed

+12
-12
lines changed

12 files changed

+12
-12
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.70.0
26+
uses: updatecli/updatecli-action@v2.72.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:2024-11-20-08-19-55
4+
FROM gitpod/workspace-full:2024-12-02-17-20-59
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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ services:
6262
timeout: 10s
6363
retries: 5
6464
default_agent:
65-
image: jenkins/ssh-agent:6.2.0
65+
image: jenkins/ssh-agent:6.4.0
6666
container_name: desktop-jenkins_agent-1
6767
profiles:
6868
- default

docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ services:
108108
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
109109
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
110110
default_agent:
111-
image: jenkins/ssh-agent:6.2.0
111+
image: jenkins/ssh-agent:6.4.0
112112
container_name: desktop-jenkins_agent-1
113113
profiles:
114114
- 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.479.1
4+
ARG JENKINS_VERSION=2.479.2
55

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

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.2.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.4.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/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:6.2.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.4.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 && \

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:6.2.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.4.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 && \

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:6.2.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.4.0 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:6.2.0 as ssh-agent
1+
FROM jenkins/ssh-agent:6.4.0 as ssh-agent
22
ARG NODE_MAJOR=22
33

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

0 commit comments

Comments
 (0)