Merge pull request #22 from jtyberg/make-20

Do not require SSL cert and key files if SECRETS_VOLUME is set.
This commit is contained in:
Min RK 2016-09-22 15:14:17 +02:00 committed by GitHub
commit 3c3b507caf

View File

@ -25,8 +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
# fail in an informative way if files don't exist 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)