Make the makefile versioned + more useful

singleuser-builder/Makefile

@@ -1,11 +1,12 @@
 
-IMAGE_NAME = ubuntu1610-python35-venv
+IMAGE_NAME = jupyterhub/singleuser-builder
+VERSION = $(shell cat version)
 
 .PHONY: build
 build:
-	docker build -t $(IMAGE_NAME) .
+	docker build -t $(IMAGE_NAME):$(VERSION) .
 
 .PHONY: test
 test:
-	docker build -t $(IMAGE_NAME)-candidate .
-	IMAGE_NAME=$(IMAGE_NAME)-candidate test/run
+	docker build -t $(IMAGE_NAME)-candidate:$(VERSION) .
+	IMAGE_NAME=$(IMAGE_NAME)-candidate:$(VERSION) test/run

singleuser-builder/s2i/bin/assemble

@@ -1,13 +1,12 @@
 #!/bin/bash -e
 #
-# S2I assemble script for the 'ubuntu1610-python35-venv' image.
+# S2I assemble script for the jupyterhub/singleuser-builder image.
 # The 'assemble' script builds your application source so that it is ready to run.
 #
 # For more information refer to the documentation:
 #	https://github.com/openshift/source-to-image/blob/master/docs/builder_image.md
 #
 
-# If the 'ubuntu1610-python35-venv' assemble script is executed with the '-h' flag, print the usage.
 if [[ "$1" == "-h" ]]; then
 	exec /usr/libexec/s2i/usage
 fi

singleuser-builder/version

@@ -0,0 +1 @@
+v0.1