diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 10f4cb4..65af6e4 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -75,8 +75,6 @@ services: image: ${LOCAL_DOCKER_REGISTRY}ngrok-gitea ports: - "4040:4040" - volumes: - - ./ngrok-gitea/ngrok._yml:/home/ngrok/.ngrok2/ngrok._yml:ro environment: - GIT_DOMAIN=${GIT_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN} diff --git a/drone-starlark/repos/stack/drone.star b/drone-starlark/repos/stack/drone.star index db74114..3570881 100644 --- a/drone-starlark/repos/stack/drone.star +++ b/drone-starlark/repos/stack/drone.star @@ -45,6 +45,13 @@ def drone( "letsencrypt-nginx", "git", ), + buildDockerFolder( + "Dockerfile.drone", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-nginx", + "$${LOCAL_DOCKER_REGISTRY}letsencrypt-drone", + "letsencrypt-nginx", + "drone", + ), scp(base), pull([ "letsencrypt-git", diff --git a/ngrok-gitea/Dockerfile b/ngrok-gitea/Dockerfile index 4518a14..b7897a1 100644 --- a/ngrok-gitea/Dockerfile +++ b/ngrok-gitea/Dockerfile @@ -1,5 +1,6 @@ FROM wernight/ngrok COPY run.sh / +COPY ngrok._yml /home/ngrok/.ngrok2/ngrok._yml USER root RUN apk add gettext # enables envsubst CMD sh /run.sh \ No newline at end of file diff --git a/ngrok-gitea/ngrok._yml b/ngrok-gitea/ngrok._yml index dc39bbe..af6fc34 100644 --- a/ngrok-gitea/ngrok._yml +++ b/ngrok-gitea/ngrok._yml @@ -22,30 +22,4 @@ tunnels: addr: letsencrypt-drone:443 proto: tls 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} \ No newline at end of file + \ No newline at end of file