From 0a84660d55620f836ba8f85e600b04268212a3a3 Mon Sep 17 00:00:00 2001 From: cnbattle Date: Sun, 8 Mar 2020 20:29:34 +0800 Subject: [PATCH] update --- README.md | 29 ++++++++++++++++++++++ docker-compose.yml | 49 ------------------------------------- drone/.env | 12 +++++++++ drone/{ => data}/.gitignore | 0 drone/docker-compose.yml | 43 ++++++++++++++++++++++++++++++++ gitea/.gitignore | 1 - gitea/data/.gitignore | 1 + gitea/docker-compose.yml | 22 +++++++++++++++++ run.sh | 40 ++++++++++++++++++++++++++++++ 9 files changed, 147 insertions(+), 50 deletions(-) delete mode 100644 docker-compose.yml create mode 100644 drone/.env rename drone/{ => data}/.gitignore (100%) create mode 100644 drone/docker-compose.yml delete mode 100755 gitea/.gitignore create mode 100755 gitea/data/.gitignore create mode 100644 gitea/docker-compose.yml create mode 100755 run.sh diff --git a/README.md b/README.md index fe329c9..30489bd 100644 --- a/README.md +++ b/README.md @@ -1 +1,30 @@ # drone and gitea + +> 需在公网上部署 + +# 使用 + +## 管理 Gitea +### 启动 Gitea +``` +./run.sh gitea start // or cd gitea && docker-compose up -d +``` +### 停止 Gitea +```bash +./run.sh gitea stop // or cd gitea && docker-compose down +``` + +### 创建 OAuth 应用 +> 参考链接， 参考 `Step 1：Preparation`部分 +[Visit](https://docs.drone.io/server/provider/gitea/) +### Create a Shared Secret +``` +openssl rand -hex 16 +``` + +## edit `.env` file + + +## Run Drone Server +``` +``` \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 5cda4c6..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,49 +0,0 @@ -version: "3" -services: - gitea: - image: gitea/gitea:1.10.1 - ports: - - "80:3000" - - "522:22" - volumes: - - ./gitea:/data - environment: - - TZ=Asia/Shanghai - restart: always - networks: - - default - - drone-server: - image: drone/drone:1 - ports: - - "8000:80" - - 9000 - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./drone/:/var/lib/drone - restart: always - networks: - - default - environment: - - DRONE_OPEN=true - - DRONE_SERVER_PROTO=http - - DRONE_SERVER_HOST=drone-server - # GITEA CONFIG - - DRONE_GITEA_SERVER=http://gitea:3000 - - TZ=Asia/Shanghai - - drone-agent: - image: drone/agent:1 - container_name: drone-agent - volumes: - - /var/run/docker.sock:/var/run/docker.sock - environment: - - DRONE_SERVER=drone-server:9000 - - DRONE_SECRET=secret - - TZ=Asia/Shanghai - restart: always - networks: - - default - -networks: - default: diff --git a/drone/.env b/drone/.env new file mode 100644 index 0000000..e33965f --- /dev/null +++ b/drone/.env @@ -0,0 +1,12 @@ + +DRONE_GITEA_SERVER=http://127.0.0.1:3000 +DRONE_GITEA_CLIENT_ID=29d717db-397a-4865-9854-d59f6ae0fcb8 +DRONE_GITEA_CLIENT_SECRET=pZcM6cj0iE_WfZXzsxLfs_SlHtW82Vb0NcvMM2D73ZE= +DRONE_RPC_SECRET=fe41e7ac77fcbb22c3c4a832012f07bb +DRONE_SERVER_HOST=127.0.0.1:8000 +DRONE_SERVER_PROTO=http + +DRONE_RPC_PROTO=http +DRONE_RPC_HOST=127.0.0.1:8000 +DRONE_RUNNER_CAPACITY=2 +DRONE_RUNNER_NAME=drone-runner \ No newline at end of file diff --git a/drone/.gitignore b/drone/data/.gitignore similarity index 100% rename from drone/.gitignore rename to drone/data/.gitignore diff --git a/drone/docker-compose.yml b/drone/docker-compose.yml new file mode 100644 index 0000000..82fc543 --- /dev/null +++ b/drone/docker-compose.yml @@ -0,0 +1,43 @@ +version: "3" +services: + drone: + image: drone/drone:1 + container_name: drone + ports: + - "8000:80" + - 9000 + volumes: + - /var/run/docker.sock:/var/run/docker.sock + - ./data/:/var/lib/drone + restart: always + networks: + - default + environment: + - DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER} + - 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} + - TZ=Asia/Shanghai + + drone-runner: + image: drone/drone-runner-docker:1 + container_name: drone-runner + volumes: + - /var/run/docker.sock:/var/run/docker.sock + environment: + - DRONE_RPC_PROTO=${DRONE_RPC_PROTO} + - DRONE_RPC_HOST=${DRONE_RPC_HOST} + - DRONE_RPC_SECRET=${DRONE_RPC_SECRET} + - DRONE_RUNNER_CAPACITY=${DRONE_RUNNER_CAPACITY} + - DRONE_RUNNER_NAME=${DRONE_RUNNER_NAME} + - TZ=Asia/Shanghai + depends_on: + - drone + restart: always + networks: + - default + +networks: + default: diff --git a/gitea/.gitignore b/gitea/.gitignore deleted file mode 100755 index 8b13789..0000000 --- a/gitea/.gitignore +++ /dev/null @@ -1 +0,0 @@ - diff --git a/gitea/data/.gitignore b/gitea/data/.gitignore new file mode 100755 index 0000000..72e8ffc --- /dev/null +++ b/gitea/data/.gitignore @@ -0,0 +1 @@ +* diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml new file mode 100644 index 0000000..f577e79 --- /dev/null +++ b/gitea/docker-compose.yml @@ -0,0 +1,22 @@ +version: "3" +services: + gitea: + image: gitea/gitea:1 + container_name: gitea + ports: + - "3000:3000" + - "3022:22" + volumes: + - /etc/timezone:/etc/timezone:ro + - /etc/localtime:/etc/localtime:ro + - ./data:/data + environment: + - USER_UID=1000 + - USER_GID=1000 + - TZ=Asia/Shanghai + restart: always + networks: + - default + +networks: + default: diff --git a/run.sh b/run.sh new file mode 100755 index 0000000..345d579 --- /dev/null +++ b/run.sh @@ -0,0 +1,40 @@ +#!/bin/bash + + +help() +{ + echo + echo "============================================" + echo "================ Miss Args ================" + echo "============================================" + echo "Run Gitea : ./run.sh gitea [start/stop]" + echo "Run Drone : ./run.sh drone [start/stop]" + echo "============================================" + echo + exit 1 +} + +run() + { + + if [ $2 == 'start' ] ;then + echo "start $1" + cd $1 + docker-compose up -d + exit 0 + fi + + if [ $2 == 'stop' ] ;then + echo "stop $1" + cd $1 + docker-compose down + exit 0 + fi + help + } + +if [ ! -n "$1" -o ! -n "$2" ] ;then + help +fi + +run $1 $2