hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-18 07:22:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final example cleanup

Browse Source 
* Fix missing export on virtualbox-vm settings
* Note about busted make on ubuntu 14.04
* Pin jupyter/minimal-notebook version so example always works
* Bit more of a hint about additional parameters

(c) Copyright IBM Corp. 2015
This commit is contained in:
Peter Parente
2015-12-28 12:01:18 -05:00
parent 65c5fadbd1
commit 74ed72a83d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/make-deploy/Dockerfile
View File

@@ -2,7 +2,7 @@
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
# Pick your favorite docker-stacks image # Pick your favorite docker-stacks image
FROM jupyter/minimal-notebook:latest FROM jupyter/minimal-notebook:2d125a7161b5
USER jovyan USER jovyan

5
examples/make-deploy/README.md
View File

@@ -2,7 +2,8 @@ This folder contains a Makefile and a set of supporting files demonstrating how
## Prerequisites ## 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-machine 0.5.0+
* docker 1.9.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? ### Are there any other options?
Yes indeed. `cat Makefile` and enjoy. Yes indeed. `cat` the Makefiles and look at the target parameters.

6
examples/make-deploy/virtualbox.makefile
View File

@@ -1,9 +1,9 @@
# Copyright (c) Jupyter Development Team. # Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License. # Distributed under the terms of the Modified BSD License.
virtualbox-vm: VIRTUALBOX_CPU_COUNT?=4 virtualbox-vm: export VIRTUALBOX_CPU_COUNT?=4
virtualbox-vm: VIRTUALBOX_DISK_SIZE?=100000 virtualbox-vm: export VIRTUALBOX_DISK_SIZE?=100000
virtualbox-vm: VIRTUALBOX_MEMORY_SIZE?=4096 virtualbox-vm: export VIRTUALBOX_MEMORY_SIZE?=4096
virtualbox-vm: check virtualbox-vm: check
@test -n "$(NAME)" || \ @test -n "$(NAME)" || \
(echo "ERROR: NAME not defined (make help)"; exit 1) (echo "ERROR: NAME not defined (make help)"; exit 1)