Skip to content

Commit 90659a0

Browse files
authored
Merge branch 'jenkins-docs:main' into main
2 parents 835c2bb + 91b60e3 commit 90659a0

File tree

14 files changed

+39
-39
lines changed

14 files changed

+39
-39
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@64a33b277ea7a1215a3c142735a1091341939ff5
41+
uses: anchore/scan-action@4e08a16a68fb1b35d2fca00f0607db0b5b5120a7
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.66.0
26+
uses: updatecli/updatecli-action@v2.68.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-08-08-14-54-59
4+
FROM gitpod/workspace-full:2024-10-21-06-09-42
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:5.46.0
65+
image: jenkins/ssh-agent:5.48.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
@@ -109,7 +109,7 @@ services:
109109
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
110110
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
111111
default_agent:
112-
image: jenkins/ssh-agent:5.46.0
112+
image: jenkins/ssh-agent:5.48.0
113113
container_name: desktop-jenkins_agent-1
114114
profiles:
115115
- 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.462.1
4+
ARG JENKINS_VERSION=2.462.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/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:5.46.0 as ssh-agent
1+
FROM jenkins/ssh-agent:5.48.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
FROM jenkins/ssh-agent:5.46.0 as ssh-agent
1+
FROM jenkins/ssh-agent:5.48.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.23.0
8+
ARG GOLANG_VERSION=1.23.2
99
ARG TARGETARCH
1010
ENV ARCHITECTURE=$TARGETARCH
1111

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:5.46.0 as ssh-agent
1+
FROM jenkins/ssh-agent:5.48.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:5.46.0 as ssh-agent
1+
FROM jenkins/ssh-agent:5.48.0 as ssh-agent
22

33
ARG NODE_MAJOR=20
44

0 commit comments

Comments
 (0)