Skip to content

Commit 923551a

Browse files
github-actions[bot]github-actions[bot]
authored
Bump ssh-agent version to 5.25.0 (#148)
* chore: [jenkins/ssh-agent] Bump Docker image tag in "build-docker-com... ... pose.yaml" Made with ❤️️ by updatecli * chore: [jenkins/ssh-agent] Bump Docker image tag in "docker-compose.y... ... aml" Made with ❤️️ by updatecli --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>
1 parent 49aca1f commit 923551a

File tree

2 files changed

+49
-50
lines changed

2 files changed

+49
-50
lines changed

‎build-docker-compose.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
timeout: 10s
3232
retries: 5
3333
default_agent:
34-
image: jenkins/ssh-agent:5.20.0
34+
image: jenkins/ssh-agent:5.25.0
3535
container_name: desktop-jenkins_agent-1
3636
depends_on:
3737
sidekick_service:

‎docker-compose.yaml

+48-49
Original file line numberDiff line numberDiff line change
@@ -4,106 +4,106 @@ services:
44
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:sidekick_${BRANCH_SUFFIX}
55
stdin_open: true
66
tty: true
7-
entrypoint: sh -c "/usr/local/bin/keygen.sh /ssh-dir" # Runs the keygen.sh script and specifies the output directory
7+
entrypoint: sh -c "/usr/local/bin/keygen.sh /ssh-dir" # Runs the keygen.sh script and specifies the output directory
88
volumes:
9-
- agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /ssh-dir path inside the container
9+
- agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /ssh-dir path inside the container
1010
healthcheck:
11-
test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ] # Checks if the conductor_ok file exists in the /ssh-dir path
11+
test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
12+
# Checks if the conductor_ok file exists in the /ssh-dir path
1213
interval: 5s
1314
timeout: 10s
1415
retries: 5
15-
1616
jenkins_controller:
1717
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:simple_controller_${BRANCH_SUFFIX}
1818
restart: on-failure
1919
ports:
2020
- "8080:8080"
2121
volumes:
22-
- jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container
23-
- agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container
22+
- jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container
23+
- agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container
2424
depends_on:
2525
sidekick_service:
26-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
26+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
2727
healthcheck:
28-
test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ] # Checks if the conductor_ok file exists in the /ssh-dir path
28+
test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
29+
# Checks if the conductor_ok file exists in the /ssh-dir path
2930
interval: 5s
3031
timeout: 10s
3132
retries: 5
32-
3333
default_agent:
34-
image: jenkins/ssh-agent:5.5.0
34+
image: jenkins/ssh-agent:5.25.0
3535
container_name: desktop-jenkins_agent-1
3636
depends_on:
3737
sidekick_service:
38-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
38+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
3939
jenkins_controller:
40-
condition: service_started
40+
condition: service_started
4141
healthcheck:
42-
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ] # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
42+
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
43+
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
4344
interval: 5s
4445
timeout: 10s
4546
retries: 5
4647
volumes:
47-
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
48-
48+
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
4949
maven:
5050
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:maven_agent_${BRANCH_SUFFIX}
5151
container_name: desktop-jenkins_agent-1
5252
profiles:
5353
- maven
5454
depends_on:
5555
sidekick_service:
56-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
56+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
5757
jenkins_controller:
58-
condition: service_started
58+
condition: service_started
5959
healthcheck:
60-
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ] # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
60+
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
61+
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
6162
interval: 5s
6263
timeout: 10s
6364
retries: 5
6465
volumes:
65-
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
66-
66+
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
6767
python:
6868
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:python_agent_${BRANCH_SUFFIX}
6969
container_name: desktop-jenkins_agent-1
7070
profiles:
7171
- python
7272
depends_on:
7373
sidekick_service:
74-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
74+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
7575
jenkins_controller:
76-
condition: service_started
76+
condition: service_started
7777
healthcheck:
78-
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ] # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
78+
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
79+
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
7980
interval: 5s
8081
timeout: 10s
8182
retries: 5
8283
volumes:
83-
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
84-
84+
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
8585
node:
8686
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:node_agent_${BRANCH_SUFFIX}
8787
environment:
88-
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
88+
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
8989
container_name: desktop-jenkins_agent-1
9090
profiles:
9191
- node
9292
depends_on:
9393
sidekick_service:
94-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
94+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
9595
jenkins_controller:
96-
condition: service_started
96+
condition: service_started
9797
ports:
9898
- "3000:3000"
9999
healthcheck:
100-
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ] # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
100+
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
101+
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
101102
interval: 5s
102103
timeout: 10s
103104
retries: 5
104105
volumes:
105-
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
106-
106+
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
107107
android:
108108
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:android_agent_${BRANCH_SUFFIX}
109109
environment:
@@ -113,20 +113,19 @@ services:
113113
- android
114114
depends_on:
115115
sidekick_service:
116-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
116+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
117117
jenkins_controller:
118118
condition: service_started
119119
ports:
120120
- "3000:3000"
121121
healthcheck:
122-
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ] # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
122+
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
123+
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
123124
interval: 5s
124125
timeout: 10s
125126
retries: 5
126127
volumes:
127-
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
128-
129-
128+
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
130129
multi_jenkins_controller:
131130
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:simple_controller_${BRANCH_SUFFIX}
132131
restart: on-failure
@@ -135,41 +134,41 @@ services:
135134
profiles:
136135
- multi
137136
volumes:
138-
- jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container
139-
- agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container
137+
- jenkins_home:/var/jenkins_home # Mounts the jenkins_home volume to the /var/jenkins_home path inside the container
138+
- agent-ssh-dir:/ssh-dir # Mounts the agent-ssh-dir volume to the /app path inside the container
140139
depends_on:
141140
sidekick_service:
142-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
141+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
143142
healthcheck:
144-
test: [ "CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1" ] # Checks if the conductor_ok file exists in the /ssh-dir path
143+
test: ["CMD-SHELL", "[ -f /ssh-dir/conductor_ok ] || exit 1"]
144+
# Checks if the conductor_ok file exists in the /ssh-dir path
145145
interval: 5s
146146
timeout: 10s
147147
retries: 5
148-
149148
multi:
150149
image: ${IMAGE_PREFIX}/${GHCR_USERNAME}/quickstart-tutorials/jenkinsci-tutorials:node_agent_${BRANCH_SUFFIX}
151150
environment:
152-
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
151+
- GITPOD_WORKSPACE_URL=${GITPOD_WORKSPACE_URL}
153152
container_name: desktop-jenkins_agent-1
154153
profiles:
155154
- multi
156155
depends_on:
157156
sidekick_service:
158-
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
157+
condition: service_completed_successfully # Depends on the successful completion of the sidekick_service
159158
multi_jenkins_controller:
160-
condition: service_started
159+
condition: service_started
161160
ports:
162161
- "3000:3000"
163162
- "5000:5000"
164163
healthcheck:
165-
test: [ "CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1" ] # Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
164+
test: ["CMD-SHELL", "[ -f /home/jenkins/.ssh/authorized_keys ] || exit 1"]
165+
# Checks if the authorized_keys file exists in the /home/jenkins/.ssh path
166166
interval: 5s
167167
timeout: 10s
168168
retries: 5
169169
volumes:
170-
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
171-
170+
- agent-ssh-dir:/home/jenkins/.ssh:ro # Mounts the agent-ssh-dir volume to the /home/jenkins/.ssh path inside the container as read-only
172171
volumes:
173-
jenkins_home:
172+
jenkins_home: null
174173
agent-ssh-dir:
175-
name: agent-ssh-dir # Creates a named volume called agent-ssh-dir
174+
name: agent-ssh-dir # Creates a named volume called agent-ssh-dir

0 commit comments

Comments
 (0)