node is host

This commit is contained in:
Yann Autissier
2022-11-29 16:22:35 +00:00
parent 2b20a33133
commit b938dd0ffd
105 changed files with 687 additions and 704 deletions
-9
View File
@@ -1,9 +0,0 @@
DRONE_GITHUB_CLIENT_ID=github_client_id
DRONE_GITHUB_CLIENT_SECRET=github_client_secret
DRONE_RPC_SECRET=drone_rpc_secret
DRONE_RUNNER_CAPACITY=1
DRONE_SERVER_HOST=drone.${APP_DOMAIN}
DRONE_SERVER_PROTO=http
DRONE_SERVER_SERVICE_80_TAGS=urlprefix-${DRONE_SERVER_HOST}/
DRONE_USER_CREATE=username:gitaccount,admin:true
DRONE_USER_FILTER=gitaccount
+4 -4
View File
@@ -6,10 +6,10 @@ services:
- drone
environment:
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
- DRONE_RPC_HOST=drone
- DRONE_RPC_PROTO=http
- DRONE_RUNNER_CAPACITY=${DRONE_RUNNER_CAPACITY}
- DRONE_RUNNER_NAME=${HOSTNAME}
- DRONE_RPC_HOST=${DRONE_RPC_HOST:-drone}
- DRONE_RPC_PROTO=${DRONE_RPC_PROTO:-http}
- DRONE_RUNNER_CAPACITY=${DRONE_RUNNER_CAPACITY:-1}
- DRONE_RUNNER_NAME=${DRONE_RUNNER_NAME:-drone-runner}
labels:
- SERVICE_3000_IGNORE=true
networks:
+8
View File
@@ -0,0 +1,8 @@
drone ?= drone/drone drone/drone-runner-docker drone/gc
DRONE_RUNNER_NAME ?= drone-runner.${APP_HOST}
DRONE_SERVER_HOST ?= drone.${APP_HOST}
DRONE_SERVICE_80_TAGS ?= $(patsubst %,urlprefix-%,$(DRONE_SERVICE_80_URIS))
DRONE_SERVICE_80_URIS ?= $(patsubst %,drone.%,$(APP_URIS))
DRONE_USER_CREATE ?= $(USER):$(GIT_USER),admin:true
DRONE_USER_FILTER ?= $(GIT_USER)
ENV_VARS += DRONE_RUNNER_NAME DRONE_SERVER_HOST DRONE_USER_CREATE DRONE_USER_FILTER DRONE_SERVICE_80_TAGS
+9 -9
View File
@@ -3,23 +3,23 @@ version: '3.6'
services:
drone:
environment:
- DRONE_GIT_ALWAYS_AUTH=false
- DRONE_GITHUB_SERVER=https://github.com
- DRONE_GIT_ALWAYS_AUTH=${DRONE_GIT_ALWAYS_AUTH:-false}
- DRONE_GITHUB_SERVER=${DRONE_GITHUB_SERVER:-https://github.com}
- DRONE_GITHUB_CLIENT_ID=${DRONE_GITHUB_CLIENT_ID}
- DRONE_GITHUB_CLIENT_SECRET=${DRONE_GITHUB_CLIENT_SECRET}
- DRONE_LOGS_COLOR=true
- DRONE_LOGS_PRETTY=true
- DRONE_PROMETHEUS_ANONYMOUS_ACCESS=true
- DRONE_LOGS_COLOR=${DRONE_LOGS_COLOR:-true}
- DRONE_LOGS_PRETTY=${DRONE_LOGS_PRETTY:-true}
- DRONE_PROMETHEUS_ANONYMOUS_ACCESS=${DRONE_PROMETHEUS_ANONYMOUS_ACCESS:-true}
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
- DRONE_SERVER_HOST=${DRONE_SERVER_HOST}
- DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO}
- DRONE_TLS_AUTOCERT=true
- DRONE_SERVER_HOST=${DRONE_SERVER_HOST:-drone}
- DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO:-http}
- DRONE_TLS_AUTOCERT=${DRONE_TLS_AUTOCERT:-true}
- DRONE_USER_CREATE=${DRONE_USER_CREATE}
- DRONE_USER_FILTER=${DRONE_USER_FILTER}
labels:
- SERVICE_80_CHECK_TCP=true
- SERVICE_80_NAME=${COMPOSE_SERVICE_NAME}-drone-80
- SERVICE_80_TAGS=${DRONE_SERVER_SERVICE_80_TAGS}
- SERVICE_80_TAGS=${DRONE_SERVICE_80_TAGS:-}
- SERVICE_443_IGNORE=true
networks:
- private
+2 -2
View File
@@ -4,8 +4,8 @@ services:
drone-gc:
image: drone/gc:latest
environment:
- GC_CACHE=20gb
- GC_INTERVAL=5m
- GC_CACHE=${DRONE_GC_CACHE:-20gb}
- GC_INTERVAL=${DRONE_GC_INTERVAL:-5m}
networks:
- private
restart: always