wip: stalled changes
This commit is contained in:
@@ -5,6 +5,6 @@ DRONE_SERVER_HOST ?= $(DRONE_SERVICE_NAME).$(firstword $
|
||||
DRONE_SERVICE_NAME ?= drone
|
||||
DRONE_SERVICE_80_NAME ?= $(DRONE_SERVICE_NAME)
|
||||
DRONE_SERVICE_80_TAGS ?= $(call tagprefix,drone,80)
|
||||
DRONE_USER_CREATE ?= $(USER):$(GIT_USER),admin:true
|
||||
DRONE_USER_CREATE ?= username:$(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
|
||||
|
||||
@@ -4,9 +4,12 @@ services:
|
||||
drone:
|
||||
environment:
|
||||
- DRONE_GIT_ALWAYS_AUTH=${DRONE_GIT_ALWAYS_AUTH:-false}
|
||||
- DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID:-}
|
||||
- DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET:-}
|
||||
- DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER:-}
|
||||
- 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_GITHUB_CLIENT_ID=${DRONE_GITHUB_CLIENT_ID:-}
|
||||
- DRONE_GITHUB_CLIENT_SECRET=${DRONE_GITHUB_CLIENT_SECRET:-}
|
||||
- DRONE_LOGS_COLOR=${DRONE_LOGS_COLOR:-true}
|
||||
- DRONE_LOGS_PRETTY=${DRONE_LOGS_PRETTY:-true}
|
||||
- DRONE_PROMETHEUS_ANONYMOUS_ACCESS=${DRONE_PROMETHEUS_ANONYMOUS_ACCESS:-true}
|
||||
@@ -14,8 +17,8 @@ services:
|
||||
- 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}
|
||||
- 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
|
||||
|
||||
Reference in New Issue
Block a user