This works mostly, would be great to get the proxy to work
This commit is contained in:
parent
0a84660d55
commit
3a55ff55c5
13
drone/.env
13
drone/.env
@ -1,12 +1,11 @@
|
|||||||
|
DRONE_GITEA_SERVER=http://git.07fi.net:3000
|
||||||
DRONE_GITEA_SERVER=http://127.0.0.1:3000
|
DRONE_GITEA_CLIENT_ID=6e80c400-ad17-4dda-b68e-0136b1677e37
|
||||||
DRONE_GITEA_CLIENT_ID=29d717db-397a-4865-9854-d59f6ae0fcb8
|
DRONE_GITEA_CLIENT_SECRET=bdRzHP9GqSvb7Dmqm7g1mkCHjXadXd74AEHtw8VPl8E=
|
||||||
DRONE_GITEA_CLIENT_SECRET=pZcM6cj0iE_WfZXzsxLfs_SlHtW82Vb0NcvMM2D73ZE=
|
DRONE_RPC_SECRET=a1cf994eee95899f31f296c25d8310f0
|
||||||
DRONE_RPC_SECRET=fe41e7ac77fcbb22c3c4a832012f07bb
|
DRONE_SERVER_HOST=drone.07fi.net:8000
|
||||||
DRONE_SERVER_HOST=127.0.0.1:8000
|
|
||||||
DRONE_SERVER_PROTO=http
|
DRONE_SERVER_PROTO=http
|
||||||
|
|
||||||
DRONE_RPC_PROTO=http
|
DRONE_RPC_PROTO=http
|
||||||
DRONE_RPC_HOST=127.0.0.1:8000
|
DRONE_RPC_HOST=drone.07fi.net:8000
|
||||||
DRONE_RUNNER_CAPACITY=2
|
DRONE_RUNNER_CAPACITY=2
|
||||||
DRONE_RUNNER_NAME=drone-runner
|
DRONE_RUNNER_NAME=drone-runner
|
@ -19,7 +19,11 @@ services:
|
|||||||
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
|
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
|
||||||
- DRONE_SERVER_HOST=${DRONE_SERVER_HOST}
|
- DRONE_SERVER_HOST=${DRONE_SERVER_HOST}
|
||||||
- DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO}
|
- DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO}
|
||||||
- TZ=Asia/Shanghai
|
- DRONE_DATABASE_DATASOURCE=/var/lib/drone/database.sqlite
|
||||||
|
- DRONE_DATABASE_DRIVER=sqlite3
|
||||||
|
- TZ=America/Chicago
|
||||||
|
- VIRTUAL_PORT=8000
|
||||||
|
- VIRTUAL_HOST=drone.07fi.net
|
||||||
|
|
||||||
drone-runner:
|
drone-runner:
|
||||||
image: drone/drone-runner-docker:1
|
image: drone/drone-runner-docker:1
|
||||||
@ -32,7 +36,7 @@ services:
|
|||||||
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
|
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
|
||||||
- DRONE_RUNNER_CAPACITY=${DRONE_RUNNER_CAPACITY}
|
- DRONE_RUNNER_CAPACITY=${DRONE_RUNNER_CAPACITY}
|
||||||
- DRONE_RUNNER_NAME=${DRONE_RUNNER_NAME}
|
- DRONE_RUNNER_NAME=${DRONE_RUNNER_NAME}
|
||||||
- TZ=Asia/Shanghai
|
- TZ=America/Chicago
|
||||||
depends_on:
|
depends_on:
|
||||||
- drone
|
- drone
|
||||||
restart: always
|
restart: always
|
||||||
@ -41,3 +45,5 @@ services:
|
|||||||
|
|
||||||
networks:
|
networks:
|
||||||
default:
|
default:
|
||||||
|
external:
|
||||||
|
name: gitea_default
|
||||||
|
@ -1,5 +1,12 @@
|
|||||||
version: "3"
|
version: "3"
|
||||||
services:
|
services:
|
||||||
|
nginx-proxy:
|
||||||
|
image: jwilder/nginx-proxy
|
||||||
|
ports:
|
||||||
|
- "80:80"
|
||||||
|
volumes:
|
||||||
|
- /var/run/docker.sock:/tmp/docker.sock:ro
|
||||||
|
- ./vhost:/etc/nginx/vhost.d:ro
|
||||||
gitea:
|
gitea:
|
||||||
image: gitea/gitea:1
|
image: gitea/gitea:1
|
||||||
container_name: gitea
|
container_name: gitea
|
||||||
@ -11,9 +18,11 @@ services:
|
|||||||
- /etc/localtime:/etc/localtime:ro
|
- /etc/localtime:/etc/localtime:ro
|
||||||
- ./data:/data
|
- ./data:/data
|
||||||
environment:
|
environment:
|
||||||
|
- VIRTUAL_PORT=3000
|
||||||
|
- VIRTUAL_HOST=git.07fi.net
|
||||||
- USER_UID=1000
|
- USER_UID=1000
|
||||||
- USER_GID=1000
|
- USER_GID=1000
|
||||||
- TZ=Asia/Shanghai
|
- TZ=America/Chicago
|
||||||
restart: always
|
restart: always
|
||||||
networks:
|
networks:
|
||||||
- default
|
- default
|
||||||
|
Loading…
Reference in New Issue
Block a user