diff --git a/.drone.do.yml b/.drone.do.yml index e32ec57..43f625d 100644 --- a/.drone.do.yml +++ b/.drone.do.yml @@ -61,12 +61,12 @@ steps: from_secret: ssh-user password: from_secret: ssh-password - key: - from_secret: ssh-key + #key: + # from_secret: ssh-key #passphrase: # from_secret: ssh-passphrase - #port: - # from_secret: ssh-port + port: + from_secret: ssh-port script: - rm -r -f ~/stack-deploy - name: wait @@ -174,6 +174,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: @@ -193,6 +195,7 @@ steps: - drone_rpc_secret - drone_gitea_client_id - drone_gitea_client_secret + - drone_convert_secret - ssh_user - local_docker_registry - certbot_email @@ -224,6 +227,7 @@ steps: - export GUACAMOLE_POSTGRES_USER=$GUACAMOLE_POSTGRES_USER - export GUACAMOLE_POSTGRES_DB=$GUACAMOLE_POSTGRES_DB - export GUACAMOLE_POSTGRES_PASSWORD=$GUACAMOLE_POSTGRES_PASSWORD + - export DRONE_CONVERT_SECRET=$DRONE_CONVERT_SECRET - docker network prune -f - cd ~/stack-deploy - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-do diff --git a/docker-compose-do.yml b/docker-compose-do.yml index 3ed9215..db0e8bd 100644 --- a/docker-compose-do.yml +++ b/docker-compose-do.yml @@ -125,6 +125,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: @@ -149,6 +151,20 @@ 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: ${LOCAL_DOCKER_REGISTRY}drone-starlark + environment: + - DRONE_DEBUG=true + - DRONE_SECRET=${DRONE_CONVERT_SECRET} + - DRONE_STARLARK_REPO_PATHS=this:/repos + networks: + - appnet registry: deploy: placement: