mm/jupyterhub-deploy-docker
1
0
Fork 0
Code Pull Requests Releases Activity

Do not require SSL cert, key files in make targets if SECRETS_VOLUME is set.

Browse Source 
(c) Copyright IBM Corp. 2016
This commit is contained in:
Justin Tyberg 2016-09-20 21:16:43 -04:00
parent 7bc6a02bcd
commit 22774d3b72
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -12,16 +12,12 @@ self-signed-cert:
# make a self-signed cert # make a self-signed cert
secrets/jupyterhub.crt: secrets/jupyterhub.crt:
@if [ "${SECRETS_VOLUME}" = "" ]; then \ @echo "Need an SSL certificate in secrets/jupyterhub.crt"
echo "Need an SSL certificate in secrets/jupyterhub.crt"; \ @exit 1
exit 1; \
fi
secrets/jupyterhub.key: secrets/jupyterhub.key:
@if [ "${SECRETS_VOLUME}" = "" ]; then \ @echo "Need an SSL key in secrets/jupyterhub.key"
echo "Need an SSL key in secrets/jupyterhub.key"; \ @exit 1
exit 1; \
fi
userlist: userlist:
@echo "Add usernames, one per line, to ./userlist, such as:" @echo "Add usernames, one per line, to ./userlist, such as:"
@ -29,7 +25,15 @@ userlist:
@echo " wash" @echo " wash"
@exit 1 @exit 1
check-files: secrets/jupyterhub.crt secrets/jupyterhub.key userlist # Do not require cert/key files if SECRETS_VOLUME defined
secrets_volume = $(shell echo $(SECRETS_VOLUME))
ifeq ($(secrets_volume),)
cert_files=secrets/jupyterhub.crt secrets/jupyterhub.key
else
cert_files=
endif
check-files: userlist $(cert_files)
pull: pull:
docker pull $(DOCKER_NOTEBOOK_IMAGE) docker pull $(DOCKER_NOTEBOOK_IMAGE)