From 74529deaef129e515f96c479d6c48d069237e439 Mon Sep 17 00:00:00 2001
From: Michael Pilosov <40366263+mathematicalmichael@users.noreply.github.com>
Date: Sun, 28 Nov 2021 16:37:33 -0700
Subject: [PATCH 1/2] Update .env

---
 .env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env b/.env
index c3065c9..292e607 100755
--- a/.env
+++ b/.env
@@ -13,7 +13,7 @@ JUPYTERHUB_VERSION=1.5.0
 # To check the ports that are in use, run `docker ps`. 
 # Generally, picking a random number between 8000-9999 won't be an issue.
 PORT_NUM=8000
-HUB_NAME=carme
+HUB_NAME=hub
 
 # Name of Docker network
 DOCKER_NETWORK_NAME=hub-network

From 83256fa5d72e802b2e1d5a41cc715781e8a95e36 Mon Sep 17 00:00:00 2001
From: Michael Pilosov <consistentbayes@gmail.com>
Date: Thu, 9 Dec 2021 13:52:12 -0700
Subject: [PATCH 2/2] updates

---
 .dockerignore      | 1 -
 docker-compose.yml | 4 ++--
 makefile           | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 6f5e52b..2bfb427 100755
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,6 +6,5 @@ README.md
 setup.sh
 show_login.sh
 groups.sh
-jupyterhub_config.py
 LICENSE
 CONTRIBUTING.md
diff --git a/docker-compose.yml b/docker-compose.yml
index 2a6929c..868c1d2 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,8 +34,8 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:rw"
       # Bind Docker volume on host for JupyterHub database and cookie secrets
       - "data:/data"
-      - "./jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py"
-      - "./userlist:/srv/jupyterhub/userlist"
+      - ./jupyterhub_config.py:/srv/jupyterhub/jupyterhub_config.py
+      - ./userlist:/srv/jupyterhub/userlist
       # - "/tmp/.X11-unix:/tmp/.X11-unix"
     ports:
       - "${PORT_NUM}:8000"
diff --git a/makefile b/makefile
index a5559a7..8cc72af 100755
--- a/makefile
+++ b/makefile
@@ -13,10 +13,12 @@ volumes:
 	@docker volume inspect $(HUB_NAME)-db-data >/dev/null 2>&1 || docker volume create --name $(HUB_NAME)-db-data
 
 secrets/postgres.env:
+	@mkdir -p secrets/
 	@echo "Generating postgres password in $@"
 	@echo "POSTGRES_PASSWORD=$(shell openssl rand -hex 32)" > $@
 
 secrets/oauth.env:
+	@mkdir -p secrets/
 	@echo "Generating hash key in $@"
 	@echo "HASH_SECRET_KEY=$(shell openssl rand -hex 32)" > $@