From 1895163c271dedd2b5bdf82f9edc0a31464d2e18 Mon Sep 17 00:00:00 2001 From: wanggang <76527413@qq.com> Date: Mon, 18 Sep 2023 17:25:00 +0800 Subject: [PATCH] update --- .env | 15 ++++++++++++ README.md | 4 ++++ docker-compose.yml | 57 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) diff --git a/.env b/.env index 9b930cc..1edbd50 100644 --- a/.env +++ b/.env @@ -1,6 +1,21 @@ +DOCKER_SOCK=/var/run/docker.sock +TZ=Asia/Shanghai + +POETAINER_VERSION=2.19.0 +PORTAINER_PORT=3009 + ZENTAO_VERSION=18.0 ZENTAO_PORT=4000 MYSQL_VERSION=8.0.31 MYSQL_ROOT_PASSWORD=aA123456! +MINIO_VERSION=RELEASE.2023-09-16T01-01-47Z +DRONE_VERSION=2.20.0 +DRONE_RUNNER_DOCKER_VERSION=1.8.3 +GITEA_SERVER_DOMAIN=dev.ccwin-in.com:3000 +DRONE_GITEA_CLIENT_ID=f9f0c14a-94a5-41cc-ac03-a69f55df9dc2 +DRONE_GITEA_CLIENT_SECRET=DhpAVKMXYbmR4PoBZvZoxmpbr2l2oAS0DnxSU8QEr0ux +DRONE_RPC_SECRET=bea26a2221fd8090ea38720fc445eca6 +DRONE_SERVER_HOST=dev.ccwin-in.com:3001 +DRONE_SERVER_PROTO=http \ No newline at end of file diff --git a/README.md b/README.md index 31a0ea3..a360faa 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,7 @@ 1. MySQL 1. 禅道 + +## drone 配置 + +1. 打开gitea->设置->应用页面,创建名为 drone 的OAuth2应用 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 975e5ae..9ff67a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,15 @@ version: "3.8" services: + portainer: + image: portainer/portainer-ce:${POETAINER_VERSION} + restart: always + container_name: portainer + ports: + - ${PORTAINER_PORT}:9000 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ./data/portainer:/data mysql: container_name: mysql restart: always @@ -26,3 +35,51 @@ services: - ./data/zentao:/www/zentaopms depends_on: - mysql + minio: + container_name: minio + restart: always + image: minio/minio:${MINIO_VERSION} + environment: + MINIO_ROOT_USER: "admin" + MINIO_ROOT_PASSWORD: "aA123456!" + command: server /data --console-address ":9001" + ports: + - 3007:9001 + - 3008:9000 + volumes: + - ./data/minio:/data + #https://docs.drone.io/server/provider/gitea/ https://github.com/drone/drone + drone: + image: drone/drone:${DRONE_VERSION} + restart: always + container_name: drone + environment: + - DRONE_GITEA_SERVER=http://${GITEA_SERVER_DOMAIN} + - DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID} + - DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET} + - DRONE_RPC_SECRET=${DRONE_RPC_SECRET} + - DRONE_SERVER_HOST=${DRONE_SERVER_HOST} + - DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO} + - DRONE_GIT_ALWAYS_AUTH=true + - DRONE_USER_CREATE=username:wanggang,admin:true + ports: + - 3001:80 + volumes: + - ./data/drone:/data + drone-runner-docker: + image: drone/drone-runner-docker:${DRONE_RUNNER_DOCKER_VERSION} + restart: always + container_name: drone-runner-docker + privileged: true + environment: + - DRONE_RPC_PROTO=${DRONE_SERVER_PROTO} + - DRONE_RPC_HOST=${DRONE_SERVER_HOST} + - DRONE_RPC_SECRET=${DRONE_RPC_SECRET} + - DRONE_RUNNER_CAPACITY=2 + - DRONE_RUNNER_NAME=drone-runner-docker + - DRONE_DEBUG=true + - DRONE_TRACE=true + volumes: + - ${DOCKER_SOCK}:/var/run/docker.sock + depends_on: + - drone