From 607318772c27125061632eb605fdfd6ffa950225 Mon Sep 17 00:00:00 2001
From: Michael Pilosov <mpilosov@gmail.com>
Date: Wed, 2 Jan 2019 06:01:42 +0000
Subject: [PATCH] stopping here, not working but building.

---
 docker-compose.yml | 80 +++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 44 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 82a91cf..6e422a0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@
 # Distributed under the terms of the Modified BSD License.
 
 # JupyterHub docker-compose configuration file
-version: "3"
+version: "2"
 
 services:
   hub-db:
@@ -16,8 +16,6 @@ services:
       - secrets/postgres.env
     volumes:
       - "db:${DB_VOLUME_CONTAINER}"
-    networks:
-      - reverseproxy
 
   hub:
     depends_on:
@@ -36,13 +34,6 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:rw"
       # Bind Docker volume on host for JupyterHub database and cookie secrets
       - "data:${DATA_VOLUME_CONTAINER}"
-    ports:
-      - "8000:8000"
-    networks:
-      - reverseproxy
-    labels:
-      - "traefik.enable=true"
-      - "traefik.frontend.rule=Host:hub.docker.localhost"
     links:
       - hub-db
     environment:
@@ -57,45 +48,51 @@ services:
       # Postgres db info
       POSTGRES_DB: ${POSTGRES_DB}
       POSTGRES_HOST: hub-db
+      VIRTUAL_HOST: hub.consistentbayes.com
+      LETSENCRYPT_HOST: hub.consistentbayes.com
+      LETSENCRYPT_EMAIL: consistentbayes@gmail.com
+
     env_file:
       - secrets/postgres.env
       - secrets/oauth.env
     command: >
       jupyterhub -f /srv/jupyterhub/jupyterhub_config.py
 
-  traefik:
-    image: traefik:latest
-    container_name: reverse-proxy
-    networks:
-      - reverseproxy
-    cap_drop:
-      - all
-    cap_add:
-      - net_bind_service
-    ports:
-      - 80:80
-      - 443:443
-      - 8080:8080
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - $PWD/traefik.toml:/traefik.toml
-      - $PWD/secrets/acme.json:/acme.json
-          
-
   nginx:
     image: nginx:latest
     container_name: nginx
-    labels:
-      - traefik.enable=true
-      - traefik.frontend.rule=Host:consistentbayes.com
-      - traefik.backend=nginx
-      - traefik.docker.network=reverseproxy
-      - traefik.port=80
-    networks:
-      - reverseproxy
-      - internal 
     volumes:
-      - ./public_html:/usr/share/nginx/html
+      - /etc/nginx/conf.d
+      - /etc/letsencrypt/live:/etc/nginx/certs:ro
+      - /etc/nginx/vhost.d
+      - /usr/share/nginx/html
+    ports:
+      - "80:80"
+      - "443:443"
+    labels:
+      - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy"
+
+  nginx-gen:
+    image: jwilder/docker-gen
+    container_name: nginx-gen
+    volumes_from: [nginx]
+    volumes:
+      - /path/to/nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    command: -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    labels:
+      - "com.github.jrcs.letsencrypt_nginx_proxy_companion.docker_gen"
+
+  nginx-letsencrypt:
+    image: jrcs/letsencrypt-nginx-proxy-companion
+    container_name: nginx-letsencrypt
+    volumes_from: [nginx]
+    volumes:
+      - /etc/letsencrypt/live:/etc/nginx/certs:rw
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      - NGINX_DOCKER_GEN_CONTAINER=nginx-gen
+      - NGINX_PROXY_CONTAINER=nginx
 
 volumes:
   data:
@@ -109,9 +106,4 @@ networks:
   default:
     external: 
       name: ${DOCKER_NETWORK_NAME}
-  reverseproxy:
-    external: 
-        name: reverseproxy
-  internal:
-    external: false