From 4e9ed54b42ab4d3420356834a2e60049d5626c71 Mon Sep 17 00:00:00 2001 From: Giles Bradshaw Date: Thu, 23 Apr 2020 20:54:37 +0100 Subject: [PATCH] starlark --- .drone.remote.yml | 4 ++++ docker-compose-remote.yml | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/.drone.remote.yml b/.drone.remote.yml index bfcfe7a..9936018 100644 --- a/.drone.remote.yml +++ b/.drone.remote.yml @@ -225,6 +225,8 @@ steps: from_secret: drone-gitea-client-id DRONE_GITEA_CLIENT_SECRET: from_secret: drone-gitea-client-secret + DRONE_CONVERT_SECRET: + from_secret: drone-convert-secret LOCAL_DOCKER_REGISTRY: from_secret: local-docker-registry SSH_USER: @@ -242,6 +244,7 @@ steps: - drone_rpc_secret - drone_gitea_client_id - drone_gitea_client_secret + - drone_convert_secret - ssh_user - local_docker_registry - certbot_email @@ -262,6 +265,7 @@ steps: - export DRONE_RPC_SECRET=$DRONE_RPC_SECRET - export DRONE_GITEA_CLIENT_ID=$DRONE_GITEA_CLIENT_ID - export DRONE_GITEA_CLIENT_SECRET=$DRONE_GITEA_CLIENT_SECRET + - export DRONE_CONVERT_SECRET=$DRONE_CONVERT_SECRET - export SSH_USER=$SSH_USER - export CERTBOT_EMAIL=$CERTBOT_EMAIL - export GIT_DOMAIN=$GIT_DOMAIN diff --git a/docker-compose-remote.yml b/docker-compose-remote.yml index 62ee687..c7f475f 100644 --- a/docker-compose-remote.yml +++ b/docker-compose-remote.yml @@ -85,6 +85,8 @@ services: - DRONE_RPC_SECRET=${DRONE_RPC_SECRET} - DRONE_USER_CREATE=username:giles,admin:true - DRONE_AGENTS_ENABLED=true + - DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000 + - DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET} #- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888 #- DRONE_ENV_PLUGIN_TOKEN=anything networks: @@ -109,6 +111,19 @@ services: - DRONE_RUNNER_NAME="docker-runner" #- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888 #- DRONE_ENV_PLUGIN_TOKEN=anything + drone-starlark: + deploy: + placement: + constraints: [node.labels.com.sigyl.git-stack == yes] + replicas: 1 + restart_policy: + condition: any + image: drone/drone-convert-starlark + environment: + - DRONE_DEBUG=true + - DRONE_SECRET=${DRONE_CONVERT_SECRET} + networks: + - appnet registry: deploy: