Merge pull request #119 from jtyberg/letsencrypt

Fix letsencrypt in make-deploy example.

examples/make-deploy/README.md

@@ -2,7 +2,7 @@ This folder contains a Makefile and a set of supporting files demonstrating how
 
 ## Prerequisites
 
-* make 3.81+ 
+* make 3.81+
     * Ubuntu users: Be aware of [make 3.81 defect 483086](https://bugs.launchpad.net/ubuntu/+source/make-dfsg/+bug/483086) which exists in 14.04 LTS but is fixed in 15.04+
 * docker-machine 0.5.0+
 * docker 1.9.0+
@@ -59,7 +59,11 @@ make letsencrypt-notebook
 
 The first command creates a Docker volume named after the notebook container with a `-secrets` suffix. It then runs the `letsencrypt` client with a slew of options (one of which has you automatically agreeing to the Let's Encrypt Terms of Service, see the Makefile). The second command mounts the secrets volume and configures Jupyter to use the full-chain certificate and private key.
 
-Be aware: Let's Encrypt has a pretty [low rate limit per domain](https://community.letsencrypt.org/t/public-beta-rate-limits/4772/3) at the moment. Don't exhaust your requests playing around!
+Be aware: Let's Encrypt has a pretty [low rate limit per domain](https://community.letsencrypt.org/t/public-beta-rate-limits/4772/3) at the moment.  You can avoid exhausting your limit by testing against the Let's Encrypt staging servers.  To hit their staging servers, set the environment variable `CERT_SERVER=--staging`.
+
+```
+make letsencrypt FQDN=host.mydomain.com EMAIL=myemail@somewhere.com CERT_SERVER=--staging
+```
 
 Also, keep in mind Let's Encrypt certificates are short lived: 90 days at the moment. You'll need to manually setup a cron job to run the renewal steps at the moment. (You can reuse the first command above.)
 

examples/make-deploy/letsencrypt.makefile

 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+# BE CAREFUL when using Docker engine <1.10 because running a container with
+# `--rm` option while mounting a docker volume may wipe out the volume.
+# See issue: https://github.com/docker/docker/issues/17907
+
+# Use letsencrypt production server by default to get a real cert.
+# Use CERT_SERVER=--staging to hit the staging server (not a real cert).
+
 letsencrypt: NAME?=notebook
 letsencrypt: SECRETS_VOLUME?=$(NAME)-secrets
+letsencrypt: TMP_CONTAINER?=$(NAME)-tmp
+letsencrypt: CERT_SERVER?=
 letsencrypt:
 	@test -n "$(FQDN)" || \
 		(echo "ERROR: FQDN not defined or blank"; exit 1)
 	@test -n "$(EMAIL)" || \
 		(echo "ERROR: EMAIL not defined or blank"; exit 1)
 	@docker volume create --name $(SECRETS_VOLUME) > /dev/null
-# Specifying an alternative cert path doesn't work with the --duplicate
-# setting which we want to use for renewal.
-	@docker run -it --rm -p 80:80 \
+	@docker run -it -p 80:80 \
+		--name=$(TMP_CONTAINER) \
 		-v $(SECRETS_VOLUME):/etc/letsencrypt \
 		quay.io/letsencrypt/letsencrypt:latest \
 		certonly \
+		$(CERT_SERVER) \
+		--keep-until-expiring \
 		--standalone \
 		--standalone-supported-challenges http-01 \
 		--agree-tos \
-		--duplicate \
 		--domain '$(FQDN)' \
-		--email '$(EMAIL)'
-# The lets encrypt image has an entrypoint so we use the notebook image
-# instead which we know uses tini as the entry and can run arbitrary commands.
-# Here we need to set the permissions so nobody in the proxy container can read
-# the cert and key. Plus we want to symlink the certs into the root of the 
-# /etc/letsencrypt directory so that the FQDN doesn't have to be known later.
-	@docker run -it --rm \
+		--email '$(EMAIL)'; \
+		docker rm -f $(TMP_CONTAINER) > /dev/null
+# The letsencrypt image has an entrypoint, so we use the notebook image
+# instead so we can run arbitrary commands.
+# Here we set the permissions so nobody can read the cert and key.
+# We also symlink the certs into the root of the /etc/letsencrypt
+# directory so that the FQDN doesn't have to be known later.
+	@docker run -it \
+		--name=$(TMP_CONTAINER) \
 		-v $(SECRETS_VOLUME):/etc/letsencrypt \
 		$(NOTEBOOK_IMAGE) \
 		bash -c "ln -s /etc/letsencrypt/live/$(FQDN)/* /etc/letsencrypt/ && \
-			find /etc/letsencrypt -type d -exec chmod 755 {} +"
+			find /etc/letsencrypt -type d -exec chmod 755 {} +"; \
+			docker rm -f $(TMP_CONTAINER) > /dev/null
 
 letsencrypt-notebook: PORT?=443
 letsencrypt-notebook: NAME?=notebook