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

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

This commit is contained in:
Giles Bradshaw 2020-10-21 12:01:04 +01:00
parent a20c5a2965
commit 79ad35c3a2
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.drone/drone-home.jsonnet
View File

@ -37,6 +37,7 @@ local config = {
'REGISTRY_DOMAIN',
'REGISTRY_PORT',
'REGISTRY_PASSWORD',
'SCHEME',
],
publicSecrets,
secretSecrets,

10
.drone/drone-home.yml
View File

@ -90,6 +90,7 @@ steps:
- registry_domain
- registry_port
- registry_password
- scheme
- domain
- drone_gitea_client_id
- drone_gitea_server
@ -105,6 +106,7 @@ steps:
- "echo \"export REGISTRY_DOMAIN='$${REGISTRY_DOMAIN}'\" >> env-drone # \"registry-domain\""
- "echo \"export REGISTRY_PORT='$${REGISTRY_PORT}'\" >> env-drone # \"registry-port\""
- "echo \"export REGISTRY_PASSWORD='$${REGISTRY_PASSWORD}'\" >> env-drone # \"registry-password\""
- "echo \"export SCHEME='$${SCHEME}'\" >> env-drone # \"scheme\""
- "echo \"export DOMAIN='$${DOMAIN}'\" >> env-drone # \"domain\""
- "echo \"export DRONE_GITEA_CLIENT_ID='$${DRONE_GITEA_CLIENT_ID}'\" >> env-drone # \"drone-gitea-client-id\""
- "echo \"export DRONE_GITEA_SERVER='$${DRONE_GITEA_SERVER}'\" >> env-drone # \"drone-gitea-server\""
@ -134,6 +136,8 @@ steps:
from_secret: registry-password
REGISTRY_PORT:
from_secret: registry-port
SCHEME:
from_secret: scheme
SSH_HOST:
from_secret: ssh-host
SSH_KEY:
@ -171,6 +175,8 @@ steps:
from_secret: registry-password
REGISTRY_PORT:
from_secret: registry-port
SCHEME:
from_secret: scheme
volumes:
- name: dockersock
path: /var/run
@ -197,6 +203,7 @@ steps:
- registry_domain
- registry_port
- registry_password
- scheme
script:
- export DRONE_GITEA_CLIENT_SECRET=$${DRONE_GITEA_CLIENT_SECRET}
- export DRONE_RPC_SECRET=$${DRONE_RPC_SECRET}
@ -211,6 +218,7 @@ steps:
- export REGISTRY_DOMAIN=$${REGISTRY_DOMAIN}
- export REGISTRY_PORT=$${REGISTRY_PORT}
- export REGISTRY_PASSWORD=$${REGISTRY_PASSWORD}
- export SCHEME=$${SCHEME}
- set -e
- cd /stack/drone
- sh .drone/login.sh
@ -235,6 +243,8 @@ steps:
from_secret: registry-password
REGISTRY_PORT:
from_secret: registry-port
SCHEME:
from_secret: scheme
SSH_HOST:
from_secret: ssh-host
SSH_KEY:

6
docker-compose.yml
View File

@ -15,12 +15,12 @@ services:
environment:
- DRONE_LOGS_DEBUG=true
- DRONE_LOGS_PRETTY=true
- DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER}
- DRONE_GITEA_SERVER=${SCHEME}://${DRONE_GITEA_SERVER}
- DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID}
- DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET}
- DRONE_SERVER_HOST=${DRONE_SERVER_HOST} # tunnel hostname
- DRONE_ADMIN=giles
- DRONE_SERVER_PROTO=https # tunnel adds https on top
- DRONE_SERVER_PROTO=${SCHEME} # tunnel adds https on top
- DRONE_SERVER_PORT=:8080
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
- DRONE_USER_CREATE=username:giles,admin:true
@ -46,7 +46,7 @@ services:
- DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
- DRONE_RUNNER_CAPACITY=8
- DRONE_RUNNER_NAME="docker-runner"
- DRONE_RUNNER_ENVIRON=DOMAIN:$DOMAIN,REGISTRY_DOMAIN:$REGISTRY_DOMAIN,REGISTRY_PORT:$REGISTRY_PORT,REGISTRY_PASSWORD:$REGISTRY_PASSWORD,SSH_HOST:$SSH_HOST,SSH_PORT:$SSH_PORT,SSH_USERNAME:$SSH_USERNAME,SSH_KEY:$SSH_KEY
- DRONE_RUNNER_ENVIRON=SCHEME:$SCHEME,DOMAIN:$DOMAIN,REGISTRY_DOMAIN:$REGISTRY_DOMAIN,REGISTRY_PORT:$REGISTRY_PORT,REGISTRY_PASSWORD:$REGISTRY_PASSWORD,SSH_HOST:$SSH_HOST,SSH_PORT:$SSH_PORT,SSH_USERNAME:$SSH_USERNAME,SSH_KEY:$SSH_KEY
networks:
- appnet
volumes: