.
continuous-integration/drone/push Build was killed Details

This commit is contained in:
Giles Bradshaw 2020-04-28 15:27:18 +01:00
parent e6491db3ee
commit bfc5c789bc
3 changed files with 11 additions and 78 deletions

View File

@ -34,21 +34,6 @@ def main(ctx):
#build("letsencrypt-nginx"), #build("letsencrypt-nginx"),
#build("drone-starlark"), #build("drone-starlark"),
#buildDockerFolder( #buildDockerFolder(
# "Dockerfile.home",
# "nginx:latest",
# "$${LOCAL_DOCKER_REGISTRY}home",
# "letsencrypt-nginx",
# "home",
#),
#buildDockerFolder(
# "Dockerfile.blog",
# "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
# "$${LOCAL_DOCKER_REGISTRY}letsencrypt-blog",
# "letsencrypt-nginx",
# "blog",
#),
#buildDockerFolder(
# "Dockerfile.drone", # "Dockerfile.drone",
# "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", # "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
# "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", # "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone",
@ -62,28 +47,10 @@ def main(ctx):
"letsencrypt-nginx", "letsencrypt-nginx",
"git", "git",
), ),
buildDockerFolder(
"Dockerfile.remote",
"$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
"$${LOCAL_DOCKER_REGISTRY}letsencrypt-remote",
"letsencrypt-nginx",
"remote",
),
buildDockerFolder(
"Dockerfile.chat",
"$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
"$${LOCAL_DOCKER_REGISTRY}letsencrypt-chat",
"letsencrypt-nginx",
"chat",
),
scp("~/gitea-drone-stack"), scp("~/gitea-drone-stack"),
pull([ pull([
"letsencrypt-git", "letsencrypt-git",
"letsencrypt-chat",
"letsencrypt-drone", "letsencrypt-drone",
"letsencrypt-remote",
"letsencrypt-blog",
"home",
"drone-starlark", "drone-starlark",
"guacamole-postgresql", "guacamole-postgresql",
]), ]),

View File

@ -1,39 +1,5 @@
version: "3.7" version: "3.7"
services: services:
letsencrypt-chat:
deploy:
placement:
constraints: [node.labels.com.sigyl.git-stack == yes]
replicas: 1
restart_policy:
condition: any
image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-chat
environment:
- SERVER_NAME=${CHAT_DOMAIN}
- CERTBOT_EMAIL=${CERTBOT_EMAIL}
- PROXY_PASS=http://chat:3000/
volumes:
- letsencrypt-chat:/etc/letsencrypt
networks:
- appnet
letsencrypt-remote:
deploy:
placement:
constraints: [node.labels.com.sigyl.git-stack == yes]
replicas: 1
restart_policy:
condition: any
image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-remote
environment:
- SERVER_NAME=${REMOTE_DOMAIN}
- CERTBOT_EMAIL=${CERTBOT_EMAIL}
- PROXY_PASS=http://guacamole:8080/guacamole/
volumes:
- letsencrypt-remote:/etc/letsencrypt
networks:
- appnet
depends_on:
- guacamole
letsencrypt-git: letsencrypt-git:
deploy: deploy:
placement: placement:

View File

@ -3,12 +3,12 @@ update: false
log: stdout log: stdout
region: eu region: eu
tunnels: tunnels:
gitea: home:
addr: letsencrypt-git:80 addr: letsencrypt-git:80
proto: http proto: http
hostname: ${GIT_DOMAIN} hostname: ${GIT_DOMAIN}
bind-tls: false bind-tls: false
gitea-tls: home-tls:
addr: letsencrypt-git:443 addr: letsencrypt-git:443
proto: tls proto: tls
hostname: ${GIT_DOMAIN} hostname: ${GIT_DOMAIN}
@ -21,15 +21,15 @@ tunnels:
addr: letsencrypt-drone:443 addr: letsencrypt-drone:443
proto: tls proto: tls
hostname: ${DRONE_DOMAIN} hostname: ${DRONE_DOMAIN}
remote: #remote:
addr: letsencrypt-remote:80 # addr: letsencrypt-remote:80
proto: http # proto: http
hostname: ${REMOTE_DOMAIN} # hostname: ${REMOTE_DOMAIN}
bind_tls: false # bind_tls: false
remote-tls: #remote-tls:
addr: letsencrypt-remote:443 # addr: letsencrypt-remote:443
proto: tls # proto: tls
hostname: ${REMOTE_DOMAIN} # hostname: ${REMOTE_DOMAIN}
#blog: #blog:
# addr: letsencrypt-blog:80 # addr: letsencrypt-blog:80
# proto: http # proto: http