LamGC/jenkins-agent-with-docker
1
0
Fork 0
mirror of https://github.com/LamGC/jenkins-agent-with-docker.git synced 2025-07-01 12:57:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Compare commits

base: LamGC:0f4dd3416d7b3eb1fc2019ca3537e7b1de9b6203
Branches Tags
LamGC:main LamGC:fix-group-invalid
...
compare: LamGC:fix-group-invalid
Branches Tags
LamGC:main LamGC:fix-group-invalid

12 Commits
0f4dd3416d ... fix-group-

Author SHA1 Message Date
LamGC
ff513bc55c 移除参数列表的输出，避免秘密信息泄露。 2023-03-28 00:43:15 +08:00
LamGC
d25df70df0 改用 runuser 了，看看行不行。 2023-03-27 23:57:47 +08:00
LamGC
c76873d688 可能是 -c 没指定 exe 路径？ 2023-03-27 22:36:37 +08:00
LamGC
38ed80428b 输出一下参数看看。 2023-03-27 18:41:56 +08:00
LamGC
997b4142c8 再试一下，看看能不能解决。 2023-03-27 18:33:56 +08:00
LamGC
fe906cb569 再试试修复 su 命令的环境变量问题。 2023-03-27 13:43:05 +08:00
LamGC
c6c2a09bc8 调整用户检测过程。 2023-03-27 13:31:50 +08:00
LamGC
1a258ea6fd 尝试换个操作。 2023-03-27 13:27:13 +08:00
LamGC
086007e04e 稍微改一下脚本看看。 2023-03-27 13:19:48 +08:00
LamGC
8776c5afbe 尝试移除 exec 来调用脚本。 2023-03-27 13:14:21 +08:00
LamGC
469be0a1a9 为脚本添加执行权限。 2023-03-27 13:04:18 +08:00
LamGC
536344d7c7 修复构建镜像时所创建的 docker 用户组无效的问题。 2023-03-27 02:35:19 +08:00
2 changed files with 30 additions and 3 deletions
Expand all files Collapse all files

7
Dockerfile
View File

@ -4,7 +4,9 @@ FROM jenkins/inbound-agent:${BASE_TAG}
USER root
RUN groupadd -g 987 docker && usermod -aG docker jenkins
COPY start-agent.sh /usr/local/bin/start.sh
RUN chmod 755 /usr/local/bin/start.sh
ENTRYPOINT [ "/bin/bash", "/usr/local/bin/start.sh" ]
RUN apt-get update && apt-get install -y \
ca-certificates \
@ -16,5 +18,4 @@ RUN apt-get update && apt-get install -y \
apt-get update && apt-get install -y docker-ce-cli docker-buildx-plugin docker-compose-plugin && \
apt-get clean && rm -rf /var/lib/apt/lists/*
USER jenkins
ENV DOCKER_HOST=unix:///var/run/docker.sock

26
start-agent.sh Normal file
View File

@ -0,0 +1,26 @@
#!/bin/bash
if [ $(id -u) != "0" ]; then
echo "This script must be run as root"
exit 1
fi
if [ -z "$GID" ]; then
echo "GID is not set"
exit 1
fi
if [ -z "$UID" ]; then
echo "UID is not set"
exit 1
fi
if ! grep -q docker /etc/group; then
groupadd -g $GID docker && usermod -aG docker jenkins
echo "Added docker group"
fi
if [ $(id -u jenkins) -ne $UID ]; then
usermod -u $UID jenkins
echo "Changed jenkins UID"
fi
echo "Starting agent..."
runuser -u jenkins -m -g docker -- /bin/bash /usr/local/bin/jenkins-agent $@