Skip to content

Commit 3c3b507

Browse files
authored
Merge pull request #22 from jtyberg/make-20
Do not require SSL cert and key files if SECRETS_VOLUME is set.
2 parents 59bae65 + 22774d3 commit 3c3b507

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,15 @@ userlist:
2525
@echo " wash"
2626
@exit 1
2727

28-
check-files: secrets/jupyterhub.crt secrets/jupyterhub.key userlist
29-
# fail in an informative way if files don't exist
28+
# Do not require cert/key files if SECRETS_VOLUME defined
29+
secrets_volume = $(shell echo $(SECRETS_VOLUME))
30+
ifeq ($(secrets_volume),)
31+
cert_files=secrets/jupyterhub.crt secrets/jupyterhub.key
32+
else
33+
cert_files=
34+
endif
35+
36+
check-files: userlist $(cert_files)
3037

3138
pull:
3239
docker pull $(DOCKER_NOTEBOOK_IMAGE)

0 commit comments

Comments
 (0)