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

This commit is contained in:
Giles Bradshaw 2020-04-28 18:08:32 +01:00
parent 6bd9d5a137
commit d151b830b8
4 changed files with 9 additions and 29 deletions

View File

@ -75,8 +75,6 @@ services:
image: ${LOCAL_DOCKER_REGISTRY}ngrok-gitea image: ${LOCAL_DOCKER_REGISTRY}ngrok-gitea
ports: ports:
- "4040:4040" - "4040:4040"
volumes:
- ./ngrok-gitea/ngrok._yml:/home/ngrok/.ngrok2/ngrok._yml:ro
environment: environment:
- GIT_DOMAIN=${GIT_DOMAIN} - GIT_DOMAIN=${GIT_DOMAIN}
- DRONE_DOMAIN=${DRONE_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN}

View File

@ -45,6 +45,13 @@ def drone(
"letsencrypt-nginx", "letsencrypt-nginx",
"git", "git",
), ),
buildDockerFolder(
"Dockerfile.drone",
"$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx",
"$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone",
"letsencrypt-nginx",
"drone",
),
scp(base), scp(base),
pull([ pull([
"letsencrypt-git", "letsencrypt-git",

View File

@ -1,5 +1,6 @@
FROM wernight/ngrok FROM wernight/ngrok
COPY run.sh / COPY run.sh /
COPY ngrok._yml /home/ngrok/.ngrok2/ngrok._yml
USER root USER root
RUN apk add gettext # enables envsubst RUN apk add gettext # enables envsubst
CMD sh /run.sh CMD sh /run.sh

View File

@ -22,30 +22,4 @@ tunnels:
addr: letsencrypt-drone:443 addr: letsencrypt-drone:443
proto: tls proto: tls
hostname: ${DRONE_DOMAIN} hostname: ${DRONE_DOMAIN}
#remote:
# addr: letsencrypt-remote:80
# proto: http
# hostname: ${REMOTE_DOMAIN}
# bind_tls: false
#remote-tls:
# addr: letsencrypt-remote:443
# proto: tls
# hostname: ${REMOTE_DOMAIN}
#blog:
# addr: letsencrypt-blog:80
# proto: http
# hostname: ${BLOG_DOMAIN}
# bind-tls: false
#blog-tls:
# addr: letsencrypt-blog:443
# proto: tls
# hostname: ${BLOG_DOMAIN}
#chat:
# addr: letsencrypt-chat:80
# proto: http
# hostname: ${CHAT_DOMAIN}
# bind_tls: false
#chat-tls:
# addr: letsencrypt-chat:443
# proto: tls
# hostname: ${CHAT_DOMAIN}