From 5b409038341f3c839c80814d0d40794767e25385 Mon Sep 17 00:00:00 2001 From: Steven Foerster Date: Fri, 27 Mar 2020 18:44:53 -0400 Subject: [PATCH] tls folder to traefik container --- base.yml | 2 +- compose/production/traefik/Dockerfile | 1 + scripts/install.sh | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/base.yml b/base.yml index b0c3bb7..17da863 100644 --- a/base.yml +++ b/base.yml @@ -46,7 +46,7 @@ services: volumes: - production_traefik:/etc/traefik/acme - /var/run/docker.sock:/var/run/docker.sock:ro - - ../mistborn_volumes/base/tls:/tls + #- ../mistborn_volumes/base/tls:/tls ports: - "0.0.0.0:80:80/tcp" - "0.0.0.0:443:443/tcp" diff --git a/compose/production/traefik/Dockerfile b/compose/production/traefik/Dockerfile index 7088e6f..575a463 100644 --- a/compose/production/traefik/Dockerfile +++ b/compose/production/traefik/Dockerfile @@ -2,4 +2,5 @@ FROM traefik:alpine RUN mkdir -p /etc/traefik/acme RUN touch /etc/traefik/acme/acme.json RUN chmod 600 /etc/traefik/acme/acme.json +COPY ./tls /tls COPY ./compose/production/traefik/traefik.toml /etc/traefik diff --git a/scripts/install.sh b/scripts/install.sh index b1dc9c0..e1534f7 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -183,8 +183,6 @@ sudo mkdir -p ../mistborn_volumes/extra cp ./compose/production/traefik/traefik.toml.template ./compose/production/traefik/traefik.toml # setup tls certs source ./scripts/subinstallers/openssl.sh -sudo rm -rf ../mistborn_volumes/base/tls -sudo mv ./tls ../mistborn_volumes/base/ # Download docker images while DNS is operable sudo docker-compose -f base.yml pull || true