Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ services:
timeout: 10s
retries: 5
default_agent:
image: jenkins/ssh-agent:6.9.0
image: jenkins/ssh-agent:6.10.0
container_name: desktop-jenkins_agent-1
profiles:
- default
Expand Down
28 changes: 14 additions & 14 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ services:
- agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /ssh-dir path inside the container
# The healthcheck command checks if the conductor_ok file exists in the /ssh-dir directory.
healthcheck:
test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
# Checks if the conductor_ok file exists in the /ssh-dir path
interval: 5s
timeout: 10s
Expand All @@ -42,7 +42,7 @@ services:
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
# The healthcheck command checks if the find-name.sh script can be executed successfully.
healthcheck:
test: [ "CMD-SHELL", "/usr/local/bin/find-name.sh || exit 0" ]
test: ["CMD-SHELL", "/usr/local/bin/find-name.sh || exit 0"]
interval: 5s
timeout: 10s
retries: 50
Expand Down Expand Up @@ -78,7 +78,7 @@ services:
sidekick_service:
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
healthcheck:
test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
# Checks if the conductor_ok file exists in the /ssh-dir path
interval: 5s
timeout: 10s
Expand All @@ -99,7 +99,7 @@ services:
sidekick_service:
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
healthcheck:
test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
# Checks if the conductor_ok file exists in the /ssh-dir path
interval: 5s
timeout: 10s
Expand All @@ -109,7 +109,7 @@ services:
# The healthcheck command for each agent checks if the authorized_keys file exists in the /home/jenkins/.ssh directory.
# The /home/jenkins/.ssh directory in each agent container is mapped to the agent-ssh-dir volume on the host.
default_agent:
image: jenkins/ssh-agent:6.9.0
image: jenkins/ssh-agent:6.10.0
container_name: desktop-jenkins_agent-1
profiles:
- default
Expand All @@ -119,7 +119,7 @@ services:
jenkins_controller:
condition: service_started
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand Down Expand Up @@ -149,7 +149,7 @@ services:
jenkins_controller:
condition: service_started
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand All @@ -167,7 +167,7 @@ services:
jenkins_controller:
condition: service_started
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand All @@ -189,7 +189,7 @@ services:
ports:
- "3000:3000"
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand All @@ -211,7 +211,7 @@ services:
ports:
- "3000:3000"
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand All @@ -232,7 +232,7 @@ services:
sidekick_service:
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
healthcheck:
test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
# Checks if the conductor_ok file exists in the /ssh-dir path
interval: 5s
timeout: 10s
Expand All @@ -253,7 +253,7 @@ services:
- "3000:3000"
- "5000:5000"
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand All @@ -275,7 +275,7 @@ services:
ports:
- "3000:3000"
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand All @@ -297,7 +297,7 @@ services:
ports:
- "3000:3000"
healthcheck:
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ]
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
interval: 5s
timeout: 10s
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/android/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/ssh-agent:6.9.0 as ssh-agent
FROM jenkins/ssh-agent:6.10.0 as ssh-agent

# ca-certificates because curl uses certificates from ca-certificates
RUN apt-get update && apt-get install -y --no-install-recommends adb build-essential ca-certificates curl file git python3 python3-pip unzip
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cpp/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/ssh-agent:6.9.0
FROM jenkins/ssh-agent:6.10.0

# Install necessary C++ build tools
RUN apt-get update && apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/golang/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/ssh-agent:6.9.0 as ssh-agent
FROM jenkins/ssh-agent:6.10.0 as ssh-agent

# ca-certificates because curl uses certificates from ca-certificates
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/maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/ssh-agent:6.9.0 as ssh-agent
FROM jenkins/ssh-agent:6.10.0 as ssh-agent

# ca-certificates because curl uses certificates from ca-certificates
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:6.9.0 as ssh-agent
FROM jenkins/ssh-agent:6.10.0 as ssh-agent

ARG NODE_MAJOR=20

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:6.9.0 as ssh-agent
FROM jenkins/ssh-agent:6.10.0 as ssh-agent
ARG NODE_MAJOR=22

# ca-certificates because curl uses certificates from ca-certificates
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:6.9.0 as ssh-agent
FROM jenkins/ssh-agent:6.10.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