Compare commits

..

2 Commits

Author SHA1 Message Date
d3b12408a6 updated README.md
All checks were successful
GIT.TSWF.IO/docker-base-images/jenkins-ssh-agent-jdk17-dind/pipeline/head This commit looks good
Gitea/docker-base-images/jenkins-ssh-agent-jdk17-dind/pipeline/head This commit looks good
2025-03-03 04:34:55 +03:00
df3d2924d9 updated Dockerfile
All checks were successful
Gitea/docker-base-images/jenkins-ssh-agent-jdk17-dind/pipeline/head This commit looks good
2025-03-03 04:19:27 +03:00
2 changed files with 10 additions and 4 deletions

View File

@ -121,7 +121,7 @@ WORKDIR "${JENKINS_AGENT_HOME}"
# The file path has been created earlier in the file by `mkdir -p` and we also have configured sshd so that it will
# allow environment variables to be sourced (see `sed` command related to `PermitUserEnvironment`)
RUN echo "PATH=${PATH}" >> ${JENKINS_AGENT_HOME}/.ssh/environment
RUN echo mkdir -p /root/.ssh/ && "PATH=${PATH}" >> /root/.ssh/environment
RUN mkdir -p /root/.ssh/ && echo "PATH=${PATH}" >> /root/.ssh/environment
COPY setup-sshd /usr/local/bin/setup-sshd
RUN chmod a+x /usr/local/bin/setup-sshd

View File

@ -20,7 +20,7 @@ dockerd-entrypoint.sh &
Генерируем новую пару SSH ключей.
```shell
ssh-keygen -t rsa -b 4096 -f .ssh/jenkins-ssh-agent -C "jenkins-ssh-agent"
```
Желательно установить [SysBox](https://github.com/nestybox/sysbox/releases/tag/v0.6.6), без него придется делать контейнер с агентом привилегированным.
@ -30,7 +30,7 @@ dockerd-entrypoint.sh &
version: '3.7'
services:
jenkins-agent:
image: git.tswf.io/docker-base-images/jenkins-ssh-agent-jdk17-dind:1.0.4
image: git.tswf.io/docker-base-images/jenkins-ssh-agent-jdk17-dind:1.0.7
restart: always
# Используем, если не хотим делать контейнер привилегированным
runtime: sysbox-runc
@ -52,4 +52,10 @@ docker compose up -d
## Настройки Jenkins
Смотри [описание агента](AGENT.README.md)
Смотри [описание агента](AGENT.README.md)
# Использование от ROOT
Образ пропатчен для возможности запуска агента от имени ROOT. Решает сложности с запуском одноразовых docker-агентов на нашей ноде.
Просто в credentials при указании логина пишем `root`. Публичный ключ прописывается и на `jenkins`, и на него.