Compare commits

..

6 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
cefcb44095 updated Dockerfile
Some checks failed
Gitea/docker-base-images/jenkins-ssh-agent-jdk17-dind/pipeline/head There was a failure building this commit
2025-03-03 04:18:28 +03:00
9b77b744e0 updated Dockerfile
Some checks failed
Gitea/docker-base-images/jenkins-ssh-agent-jdk17-dind/pipeline/head There was a failure building this commit
2025-03-03 04:16:50 +03:00
e260864a84 updated entrypoint
All checks were successful
Gitea/docker-base-images/jenkins-ssh-agent-jdk17-dind/pipeline/head This commit looks good
2025-03-03 04:12:40 +03:00
44c51a62e5 feature: allow to connect as root
All checks were successful
Gitea/docker-base-images/jenkins-ssh-agent-jdk17-dind/pipeline/head This commit looks good
2025-03-03 04:08:14 +03:00
3 changed files with 16 additions and 4 deletions

View File

@ -100,7 +100,7 @@ RUN apk add --no-cache \
# setup SSH server # setup SSH server
RUN sed -i /etc/ssh/sshd_config \ RUN sed -i /etc/ssh/sshd_config \
-e 's/#PermitRootLogin.*/PermitRootLogin no/' \ -e 's/#PermitRootLogin.*/PermitRootLogin yes/' \
-e 's/#PasswordAuthentication.*/PasswordAuthentication no/' \ -e 's/#PasswordAuthentication.*/PasswordAuthentication no/' \
-e 's/#SyslogFacility.*/SyslogFacility AUTH/' \ -e 's/#SyslogFacility.*/SyslogFacility AUTH/' \
-e 's/#LogLevel.*/LogLevel INFO/' \ -e 's/#LogLevel.*/LogLevel INFO/' \
@ -121,6 +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 # 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`) # allow environment variables to be sourced (see `sed` command related to `PermitUserEnvironment`)
RUN echo "PATH=${PATH}" >> ${JENKINS_AGENT_HOME}/.ssh/environment RUN echo "PATH=${PATH}" >> ${JENKINS_AGENT_HOME}/.ssh/environment
RUN mkdir -p /root/.ssh/ && echo "PATH=${PATH}" >> /root/.ssh/environment
COPY setup-sshd /usr/local/bin/setup-sshd COPY setup-sshd /usr/local/bin/setup-sshd
RUN chmod a+x /usr/local/bin/setup-sshd RUN chmod a+x /usr/local/bin/setup-sshd

View File

@ -20,7 +20,7 @@ dockerd-entrypoint.sh &
Генерируем новую пару SSH ключей. Генерируем новую пару SSH ключей.
```shell ```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), без него придется делать контейнер с агентом привилегированным. Желательно установить [SysBox](https://github.com/nestybox/sysbox/releases/tag/v0.6.6), без него придется делать контейнер с агентом привилегированным.
@ -30,7 +30,7 @@ dockerd-entrypoint.sh &
version: '3.7' version: '3.7'
services: services:
jenkins-agent: 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 restart: always
# Используем, если не хотим делать контейнер привилегированным # Используем, если не хотим делать контейнер привилегированным
runtime: sysbox-runc runtime: sysbox-runc
@ -53,3 +53,9 @@ docker compose up -d
## Настройки Jenkins ## Настройки Jenkins
Смотри [описание агента](AGENT.README.md) Смотри [описание агента](AGENT.README.md)
# Использование от ROOT
Образ пропатчен для возможности запуска агента от имени ROOT. Решает сложности с запуском одноразовых docker-агентов на нашей ноде.
Просто в credentials при указании логина пишем `root`. Публичный ключ прописывается и на `jenkins`, и на него.

View File

@ -43,6 +43,11 @@ write_key() {
echo "$1" > "${JENKINS_AGENT_HOME}/.ssh/authorized_keys" echo "$1" > "${JENKINS_AGENT_HOME}/.ssh/authorized_keys"
chown -Rf "${ID_GROUP}" "${JENKINS_AGENT_HOME}/.ssh" chown -Rf "${ID_GROUP}" "${JENKINS_AGENT_HOME}/.ssh"
chmod 0700 -R "${JENKINS_AGENT_HOME}/.ssh" chmod 0700 -R "${JENKINS_AGENT_HOME}/.ssh"
mkdir -p "/root/.ssh"
echo "$1" > "/root/.ssh/authorized_keys"
chown -Rf root /root/.ssh
chmod 0700 -R /root/.ssh
} }
if [[ ${JENKINS_AGENT_SSH_PUBKEY} == ssh-* ]]; then if [[ ${JENKINS_AGENT_SSH_PUBKEY} == ssh-* ]]; then