giles
/
stack
Archived
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-04-27 11:57:28 +01:00
parent 3b6db5d6eb
commit f757040c71
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.drone.do.yml
View File

@ -61,12 +61,12 @@ steps:
from_secret: ssh-user from_secret: ssh-user
password: password:
from_secret: ssh-password from_secret: ssh-password
key: #key:
from_secret: ssh-key # from_secret: ssh-key
#passphrase: #passphrase:
# from_secret: ssh-passphrase # from_secret: ssh-passphrase
#port: port:
# from_secret: ssh-port from_secret: ssh-port
script: script:
- rm -r -f ~/stack-deploy - rm -r -f ~/stack-deploy
- name: wait - name: wait
@ -174,6 +174,8 @@ steps:
from_secret: drone-gitea-client-id from_secret: drone-gitea-client-id
DRONE_GITEA_CLIENT_SECRET: DRONE_GITEA_CLIENT_SECRET:
from_secret: drone-gitea-client-secret from_secret: drone-gitea-client-secret
DRONE_CONVERT_SECRET:
from_secret: drone-convert-secret
LOCAL_DOCKER_REGISTRY: LOCAL_DOCKER_REGISTRY:
from_secret: local-docker-registry from_secret: local-docker-registry
SSH_USER: SSH_USER:
@ -193,6 +195,7 @@ steps:
- drone_rpc_secret - drone_rpc_secret
- drone_gitea_client_id - drone_gitea_client_id
- drone_gitea_client_secret - drone_gitea_client_secret
- drone_convert_secret
- ssh_user - ssh_user
- local_docker_registry - local_docker_registry
- certbot_email - certbot_email
@ -224,6 +227,7 @@ steps:
- export GUACAMOLE_POSTGRES_USER=$GUACAMOLE_POSTGRES_USER - export GUACAMOLE_POSTGRES_USER=$GUACAMOLE_POSTGRES_USER
- export GUACAMOLE_POSTGRES_DB=$GUACAMOLE_POSTGRES_DB - export GUACAMOLE_POSTGRES_DB=$GUACAMOLE_POSTGRES_DB
- export GUACAMOLE_POSTGRES_PASSWORD=$GUACAMOLE_POSTGRES_PASSWORD - export GUACAMOLE_POSTGRES_PASSWORD=$GUACAMOLE_POSTGRES_PASSWORD
- export DRONE_CONVERT_SECRET=$DRONE_CONVERT_SECRET
- docker network prune -f - docker network prune -f
- cd ~/stack-deploy - cd ~/stack-deploy
- docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-do - docker pull $${LOCAL_DOCKER_REGISTRY}letsencrypt-do

16
docker-compose-do.yml
View File

@ -125,6 +125,8 @@ services:
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET} - DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
- DRONE_USER_CREATE=username:giles,admin:true - DRONE_USER_CREATE=username:giles,admin:true
- DRONE_AGENTS_ENABLED=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_ENDPOINT=http://git.local-domain:8888
#- DRONE_ENV_PLUGIN_TOKEN=anything #- DRONE_ENV_PLUGIN_TOKEN=anything
networks: networks:
@ -149,6 +151,20 @@ services:
- DRONE_RUNNER_NAME="docker-runner" - DRONE_RUNNER_NAME="docker-runner"
#- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888 #- DRONE_ENV_PLUGIN_ENDPOINT=http://git.local-domain:8888
#- DRONE_ENV_PLUGIN_TOKEN=anything #- 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: registry:
deploy: deploy:
placement: placement: