restarting on a new ish.

This commit is contained in:
Michael Pilosov 2019-01-02 04:35:56 +00:00
parent 0c9dda690d
commit ebd879b883
2 changed files with 40 additions and 18 deletions

View File

@ -17,7 +17,7 @@ services:
volumes: volumes:
- "db:${DB_VOLUME_CONTAINER}" - "db:${DB_VOLUME_CONTAINER}"
networks: networks:
- traefik-network - reverseproxy
hub: hub:
depends_on: depends_on:
@ -39,7 +39,7 @@ services:
ports: ports:
- "8000:8000" - "8000:8000"
networks: networks:
- traefik-network - reverseproxy
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.frontend.rule=Host:hub.docker.localhost" - "traefik.frontend.rule=Host:hub.docker.localhost"
@ -63,30 +63,37 @@ services:
command: > command: >
jupyterhub -f /srv/jupyterhub/jupyterhub_config.py jupyterhub -f /srv/jupyterhub/jupyterhub_config.py
reverse-proxy: traefik:
image: traefik:latest image: traefik:latest
container_name: reverse-proxy container_name: reverse-proxy
command: --web --docker --docker.domain=docker.localhost --logLevel=DEBUG
networks: networks:
- traefik-network - reverseproxy
cap_drop:
- all
cap_add:
- net_bind_service
ports: ports:
- 80:80 - 80:80
- 443:443 - 443:443
- 8080:8080 - 8080:8080
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- ./traefik.toml:/traefik.toml - $PWD/traefik.toml:/traefik.toml
- ./secrets/acme.json:/acme.json - $PWD/secrets/acme.json:/acme.json
nginx: nginx:
image: nginx:latest image: nginx:latest
container_name: nginx container_name: nginx
labels: labels:
- "traefik.enable=true" - traefik.enable=true
- "traefik.frontend.rule=Host:www.docker.localhost" - traefik.frontend.rule=Host:consistentbayes.com
- traefik.backend=nginx
- traefik.docker.network=reverseproxy
- traefik.port=80
networks: networks:
- traefik-network - reverseproxy
- internal
volumes: volumes:
- ./public_html:/usr/share/nginx/html - ./public_html:/usr/share/nginx/html
@ -100,7 +107,11 @@ volumes:
networks: networks:
default: default:
external: external:
name: ${DOCKER_NETWORK_NAME} name: ${DOCKER_NETWORK_NAME}
traefik-network: reverseproxy:
external: true external:
name: reverseproxy
internal:
external: false

View File

@ -1,12 +1,15 @@
logLevel = "DEBUG" logLevel = "DEBUG"
defaultEntryPoints = ["http", "https"] defaultEntryPoints = ["http", "https"]
[web] [api]
address = ":8080" dashboard = true
entrypoint = "webentry"
[docker] [docker]
domain ="docker.localhost" domain ="consistentbayes.com"
watch = true watch = true
exposedbydefault = false
endpoint = "unix:///var/run/docker.sock"
[entryPoints] [entryPoints]
[entryPoints.http] [entryPoints.http]
@ -16,14 +19,22 @@ watch = true
[entryPoints.https] [entryPoints.https]
address = ":443" address = ":443"
[entryPoints.https.tls] [entryPoints.https.tls]
[entrypoints.webentry]
address = ":8080"
[entrypoints.webentry.auth]
[entrypoints.webentry.auth.basic]
users = ["admin:$apr1$Wc4H94je$1rkT26mDWGkQ/UVDLc7E9."]
[acme] [acme]
email="consistentbayes@gmail.com" email="consistentbayes@gmail.com"
storage="acme.json" storage="secrets/acme.json"
entryPoint="https" entryPoint="https"
acmeLogging=true acmeLogging=true
onDemand=true onDemand=false
OnHostRule=true OnHostRule=true
[acme.httpChallenge] [acme.httpChallenge]
entryPoint = "http" entryPoint = "http"
provider = "namecheap"
delayBeforeCheck = 0