diff --git a/examples/make-deploy/Dockerfile b/examples/make-deploy/Dockerfile index fc4df81f..1cc71656 100644 --- a/examples/make-deploy/Dockerfile +++ b/examples/make-deploy/Dockerfile @@ -2,7 +2,7 @@ # Distributed under the terms of the Modified BSD License. # Pick your favorite docker-stacks image -FROM jupyter/minimal-notebook:latest +FROM jupyter/minimal-notebook:2d125a7161b5 USER jovyan diff --git a/examples/make-deploy/README.md b/examples/make-deploy/README.md index a234f56f..c9d0462e 100644 --- a/examples/make-deploy/README.md +++ b/examples/make-deploy/README.md @@ -2,7 +2,8 @@ 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+ @@ -109,4 +110,4 @@ Yes, sorry Windows users. It got the job done for a simple example. We can certa ### Are there any other options? -Yes indeed. `cat Makefile` and enjoy. +Yes indeed. `cat` the Makefiles and look at the target parameters. diff --git a/examples/make-deploy/virtualbox.makefile b/examples/make-deploy/virtualbox.makefile index 66f93dec..73d6e44c 100644 --- a/examples/make-deploy/virtualbox.makefile +++ b/examples/make-deploy/virtualbox.makefile @@ -1,9 +1,9 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -virtualbox-vm: VIRTUALBOX_CPU_COUNT?=4 -virtualbox-vm: VIRTUALBOX_DISK_SIZE?=100000 -virtualbox-vm: VIRTUALBOX_MEMORY_SIZE?=4096 +virtualbox-vm: export VIRTUALBOX_CPU_COUNT?=4 +virtualbox-vm: export VIRTUALBOX_DISK_SIZE?=100000 +virtualbox-vm: export VIRTUALBOX_MEMORY_SIZE?=4096 virtualbox-vm: check @test -n "$(NAME)" || \ (echo "ERROR: NAME not defined (make help)"; exit 1)