aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add gitlab auth to drone stack

Browse Source
This commit is contained in:
Yann Autissier
2025-08-08 15:59:06 +02:00
parent 360e65656b
commit 45b6418679
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
make/apps/def.mk
+1 -1
View File
@@ -25,7 +25,7 @@ APP_URL ?= $(patsubst %,$(APP_SCHEME)://%,$(APP_URI))
APP_VERSION ?= $(VERSION)
CONTEXT += APP APPS BRANCH DOMAIN VERSION RELEASE
CONTEXT_DEBUG += APP_DIR APP_URL APP_REPOSITORY APP_UPSTREAM_REPOSITORY ENV_DEPLOY
ENV_DEPLOY ?= $(patsubst origin/%,%,$(shell git rev-parse --symbolic --remotes=origin |sed '/origin\/HEAD/d' 2>/dev/null))
ENV_DEPLOY ?= $(patsubst origin/%,%,$(shell git rev-parse --symbolic --remotes=origin 2>/dev/null |sed '/origin\/HEAD/d'))
ENV_VARS += APP_DIR APP_DOMAIN APP_HOST APP_PATH APP_URL CONSUL_HTTP_TOKEN $(if $(filter true,$(MOUNT_NFS)),NFS_CONFIG)
MAKECMDARGS += exec exec:% exec@% run run:% run@%
MOUNT_NFS ?= false
stack/drone/drone.yml
+6 -3
View File
@@ -7,9 +7,12 @@ services:
- 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_SERVER=${DRONE_GITHUB_SERVER:-https://github.com}
- DRONE_GITLAB_CLIENT_ID=${DRONE_GITLAB_CLIENT_ID:-}
- DRONE_GITLAB_CLIENT_SECRET=${DRONE_GITLAB_CLIENT_SECRET:-}
- DRONE_GITLAB_SERVER=${DRONE_GITLAB_SERVER:-https://gitlab.com}
- DRONE_LOGS_COLOR=${DRONE_LOGS_COLOR:-true}
- DRONE_LOGS_PRETTY=${DRONE_LOGS_PRETTY:-true}
- DRONE_PROMETHEUS_ANONYMOUS_ACCESS=${DRONE_PROMETHEUS_ANONYMOUS_ACCESS:-true}
@@ -17,8 +20,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