feat(Dockerfile): add docker client

nokome · nokome · commit bc0415eccc48 · 2019-01-30T20:01:19.000+13:00
diff --git a/Dockerfile b/Dockerfile
@@ -2,8 +2,11 @@
 
 # Build the Nixster binary
 # Note that the `nixster` binary produced will include native modules
-# e.g. better-sqlite3.node for the platform it is built on (so it needs
+# e.g. `better-sqlite3.node` for the platform it is built on (so it needs
 # to be a Linux builder to run on Linux-based Docker image)
+# You can test this stage alone by building and running like this:
+#   docker build . --target builder --tag stencila/nixster:builder
+#   docker run --rm -it -p 3000:3000 stencila/nixster:builder ./build/nixster serve
 
 FROM node:10 AS builder
 WORKDIR /nixster
@@ -73,4 +76,11 @@ RUN nix-channel --add https://nixos.org/channels/nixos-18.09 \
  && nix-channel --update \
  && nixster update nixos-18.09
 
+# Install Docker (only the client is used in this image, the daemon runs elsewhere)
+# HT to https://stackoverflow.com/a/43594065
+ENV DOCKERVERSION=18.09.1
+RUN wget https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKERVERSION}.tgz \
+ && tar xzvf docker-${DOCKERVERSION}.tgz --strip 1 -C /usr/local/bin docker/docker \
+ && rm docker-${DOCKERVERSION}.tgz
+
 CMD nixster serve
diff --git a/Makefile b/Makefile
@@ -37,7 +37,11 @@ docker-build:
 
 # Run the Nixster server 
 docker-serve:
-	docker run --rm --interactive --tty --volume $$PWD/nixstore:/nixstore --publish 3000:3000 stencila/nixster nixster serve
+	docker run --rm --interactive --tty \
+		--volume $$PWD/nixstore:/nixstore \
+		--volume /var/run/docker.sock:/var/run/docker.sock \
+		--publish 3000:3000 \
+		stencila/nixster nixster serve
 
 # Interact with the container in a Bash shell. Useful for debugging build errors
 docker-interact:
