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)" > $@