mirror of
https://github.com/LamGC/jenkins-agent-with-docker.git
synced 2026-01-12 20:30:44 +00:00
Compare commits
12 Commits
main
...
fix-group-
| Author | SHA1 | Date | |
|---|---|---|---|
|
ff513bc55c
|
|||
|
d25df70df0
|
|||
|
c76873d688
|
|||
|
38ed80428b
|
|||
|
997b4142c8
|
|||
|
fe906cb569
|
|||
|
c6c2a09bc8
|
|||
|
1a258ea6fd
|
|||
|
086007e04e
|
|||
|
8776c5afbe
|
|||
|
469be0a1a9
|
|||
|
536344d7c7
|
5
.github/workflows/check-updates.yml
vendored
5
.github/workflows/check-updates.yml
vendored
@ -19,8 +19,6 @@ jobs:
|
||||
uses: actions/checkout@v3
|
||||
with:
|
||||
token: ${{ secrets.CHECK_UPDATES_TOKEN }}
|
||||
- name: Install dependencies
|
||||
run: sudo apt-get install -y jq
|
||||
- name: Check updates
|
||||
run: chmod +x ./update-version.sh && ./update-version.sh
|
||||
- name: Get latest version
|
||||
@ -31,5 +29,4 @@ jobs:
|
||||
with:
|
||||
commit_message: Update LATEST_VERSION to ${{ steps.latest-version.outputs.version }}
|
||||
commit_options: '--no-verify'
|
||||
push_options: '--force'
|
||||
file_pattern: LATEST_VERSION
|
||||
file_pattern: LATEST_VERSION
|
||||
@ -1 +0,0 @@
|
||||
3355.v388858a_47b_33-5
|
||||
40
README.md
40
README.md
@ -1,42 +1,2 @@
|
||||
# jenkins-agent-with-docker
|
||||
|
||||
带有 Docker CLI 的 Jenkins agent 镜像。
|
||||
|
||||
> **Note**:仅适用于 Docker,不适用于 Podman。
|
||||
|
||||
## 安全警告
|
||||
|
||||
将宿主机的 Docker 访问接口提供给 Jenkins 容器(包括 Agent)是一件很危险的事情,一旦 Jenkins 执行了恶意流水线,
|
||||
那么流水线将能完全控制 Docker Engine,甚至能够访问宿主机的所有文件。因此,使用此镜像时必须非常小心。
|
||||
|
||||
## Usage
|
||||
|
||||
使用此镜像必须将宿主机的 `/var/run/docker.sock` 映射到容器内同等目录,否则 Docker CLI 无法正常工作。
|
||||
|
||||
### 创建用户和用户组
|
||||
|
||||
如果 Docker 不是用软件包管理器安装的,那就要先创建一个 `docker` 用户组,然后将 `jenkins` 用户加入到该用户组内:
|
||||
|
||||
```bash
|
||||
sudo groupadd docker
|
||||
```
|
||||
|
||||
然后创建一个 `jenkins` 用户,并将其加入到 Docker 用户组内:
|
||||
|
||||
```bash
|
||||
sudo useradd -m -g docker jenkins
|
||||
```
|
||||
|
||||
### 部署 Jenkins Agent 容器
|
||||
|
||||
在原先的部署命令上,添加 `/var/run/docker.sock` 的映射和宿主机 `jenkins` 用户、`docker` 用户组的 ID 到容器中:
|
||||
|
||||
```bash
|
||||
docker run -d --name agent \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-e GID=$(grep docker /etc/group | cut -d: -f3) \
|
||||
-e UID=$(id -u jenkins) \
|
||||
lamgc/jenkins-agent-docker -url {JENKINS_URL} -workDir=/home/jenkins/agent {Secret} {Agent_Name}
|
||||
```
|
||||
|
||||
具体配置请参考原版镜像说明:[jenkins/inbound-agent - Readme](https://github.com/jenkinsci/docker-inbound-agent/#readme)
|
||||
|
||||
@ -1,39 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
TEMP_JSON=$(mktemp)
|
||||
trap 'rm -f "$TEMP_JSON"' EXIT
|
||||
API_URL="https://api.github.com/repos/jenkinsci/docker-agent/releases/latest"
|
||||
|
||||
HTTP_CODE=$(curl -fsL -o "$TEMP_JSON" -w "%{http_code}" "$API_URL")
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error: Network request failed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$HTTP_CODE" != "200" ]; then
|
||||
echo "Error: API returned HTTP $HTTP_CODE"
|
||||
if [ -s "$TEMP_JSON" ]; then
|
||||
echo "Response body:"
|
||||
cat "$TEMP_JSON"
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
|
||||
LATEST_VERSION=$(jq -r '.tag_name // empty' "$TEMP_JSON")
|
||||
if [ -z "$LATEST_VERSION" ] || [ "$LATEST_VERSION" == "null" ]; then
|
||||
echo "Error: Failed to extract tag_name from response."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f LATEST_VERSION ]; then
|
||||
CURRENT_VERSION=$(cat LATEST_VERSION)
|
||||
else
|
||||
CURRENT_VERSION=""
|
||||
fi
|
||||
|
||||
if [ "$LATEST_VERSION" != "$CURRENT_VERSION" ]; then
|
||||
echo "New version found: $LATEST_VERSION (Old: $CURRENT_VERSION)"
|
||||
LATEST_VERSION=$(curl -s https://api.github.com/repos/jenkinsci/docker-inbound-agent/releases/latest | grep tag_name | cut -d '"' -f 4)
|
||||
if [ "$LATEST_VERSION" != "$(cat LATEST_VERSION)" ]; then
|
||||
echo "$LATEST_VERSION" > LATEST_VERSION
|
||||
else
|
||||
echo "Already at latest version: $LATEST_VERSION"
|
||||
fi
|
||||
fi
|
||||
Reference in New Issue
Block a user