From 93660a19ca9b9ba65239b0a65456628ab59a2175 Mon Sep 17 00:00:00 2001 From: moisei Date: Tue, 16 Aug 2016 09:34:57 +0300 Subject: [PATCH 1/2] install docker on jupyterhub container --- Dockerfile.jupyterhub | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Dockerfile.jupyterhub b/Dockerfile.jupyterhub index 16d9bf0..bd5abca 100644 --- a/Dockerfile.jupyterhub +++ b/Dockerfile.jupyterhub @@ -8,6 +8,11 @@ RUN /opt/conda/bin/pip install \ oauthenticator==0.4.* \ dockerspawner==0.4.* +# install docker on the jupyterhub container +RUN wget https://get.docker.com -q -O /tmp/getdocker && \ + chmod +x /tmp/getdocker && \ + sh /tmp/getdocker + # Copy TLS certificate and key ENV SSL_CERT /srv/jupyterhub/secrets/jupyterhub.crt ENV SSL_KEY /srv/jupyterhub/secrets/jupyterhub.key From dff2a90328c3ed92c32ef68e828be2a406903d85 Mon Sep 17 00:00:00 2001 From: Moisei Date: Thu, 18 Aug 2016 10:06:53 +0300 Subject: [PATCH 2/2] no need to mount docker binary from the host If docker is installed in the JHub container, then there's no point in mounting the binary from the host. --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d149f79..8943af3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,9 +12,6 @@ services: image: jupyterhub container_name: jupyterhub volumes: - # Bind Docker binary from host machine so we can invoke Docker commands - # from inside container - - "/usr/local/bin/docker:/usr/local/bin/docker:ro" # Bind Docker socket on the host so we can connect to the daemon from # within the container - "/var/run/docker.sock:/var/run/docker.sock:rw"