From fb56ce33b407d523ec2481773d45e5abd18db5b6 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:08:01 +0100 Subject: [PATCH 01/20] Try to fix build --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 3ea45cf84..7a4eff8c1 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update + echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="docker-engine python3.4-venv"; \ else \ From fbd3fe30bd1b2c2b4b3801b9cdb2dbe5296fd8c9 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:10:34 +0100 Subject: [PATCH 02/20] Try 2 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7a4eff8c1..545a1b1d9 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update - echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list + sudo echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="docker-engine python3.4-venv"; \ else \ From 8c4ae1c2fad3350fc2fc4ecd7404d2f3eb921e21 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:19:29 +0100 Subject: [PATCH 03/20] Try 3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 545a1b1d9..227436f0f 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update - sudo echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list + sudo echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="docker-engine python3.4-venv"; \ else \ From 068f6d41511cb891ebd8974bae13b1cf3daec696 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:25:55 +0100 Subject: [PATCH 04/20] Print ubuntu version --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 227436f0f..0abd16d0c 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update + lsb_release -c sudo echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="docker-engine python3.4-venv"; \ From a5b2014724b5431279204c5bb643a9da9dc8fcb3 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:28:53 +0100 Subject: [PATCH 05/20] Try 4 --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0abd16d0c..373315f5f 100644 --- a/Makefile +++ b/Makefile @@ -26,8 +26,7 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update - lsb_release -c - sudo echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" | sudo tee /etc/apt/sources.list.d/docker.list + sudo echo "deb https://apt.dockerproject.org/repo trusty main" | sudo tee /etc/apt/sources.list.d/docker.list if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="docker-engine python3.4-venv"; \ else \ From 12498da94fc895fa417928cb47af04f9fc8ea97e Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:31:59 +0100 Subject: [PATCH 06/20] Last try --- Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 373315f5f..c9aa42d16 100644 --- a/Makefile +++ b/Makefile @@ -26,13 +26,7 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update - sudo echo "deb https://apt.dockerproject.org/repo trusty main" | sudo tee /etc/apt/sources.list.d/docker.list - if [ `lsb_release -rs` = "14.04" ]; then \ - plat_packages="docker-engine python3.4-venv"; \ - else \ - plat_packages="docker.io python3-venv"; \ - fi; \ - sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y $$plat_packages nodejs python3-pip + sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y docker.io python3-venv nodejs python3-pip node --version npm --version npm install From bfb14a7cfd6ebc670ad39706cd8d623b5b66fe72 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:37:06 +0100 Subject: [PATCH 07/20] Very last try --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c9aa42d16..0fca3fef2 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update - sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y docker.io python3-venv nodejs python3-pip + sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y docker.io python3.4-venv nodejs python3-pip node --version npm --version npm install From 4c59cf671dbb545a5fdf97fcc2f1f6744b494ff4 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:52:24 +0100 Subject: [PATCH 08/20] Print docker version --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 0fca3fef2..ca321dab5 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ deps: curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y docker.io python3.4-venv nodejs python3-pip + docker --version node --version npm --version npm install From c5eae62554cf6093e188efa3fe55501b45db1c92 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 17:54:19 +0100 Subject: [PATCH 09/20] Clean change --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca321dab5..73d7d8abc 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,12 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -qq update - sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y docker.io python3.4-venv nodejs python3-pip + if [ `lsb_release -rs` = "14.04" ]; then \ + plat_packages="docker.io python3.4-venv"; \ + else \ + plat_packages="docker.io python3-venv"; \ + fi; \ + sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y $$plat_packages nodejs python3-pip docker --version node --version npm --version From 0973d6ed2c256b299cd5fc378937172cb21e8f2f Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 18:06:55 +0100 Subject: [PATCH 10/20] Change version of docker-py --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index db94425f3..c705cbcd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ tornado==4.3 requests==2.10.0 # We want 1.8 because 1.10 uses API version 1.24 and the docker server # on ubuntu uses 1.23, so they don't like each other. -docker-py==1.8 +docker-py==1.22 escapism==0.0.1 jinja2==2.8 git+git://github.com/jupyterhub/jupyterhub.git@2d1a45f0190059ef436c2f97dc8d6e391eb2d139#egg=jupyterhub From 830dc133e91509d1e6f97fbb37d590e96bad01e6 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Thu, 22 Jun 2017 18:13:00 +0100 Subject: [PATCH 11/20] Undo last commit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c705cbcd6..db94425f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ tornado==4.3 requests==2.10.0 # We want 1.8 because 1.10 uses API version 1.24 and the docker server # on ubuntu uses 1.23, so they don't like each other. -docker-py==1.22 +docker-py==1.8 escapism==0.0.1 jinja2==2.8 git+git://github.com/jupyterhub/jupyterhub.git@2d1a45f0190059ef436c2f97dc8d6e391eb2d139#egg=jupyterhub From fbe99845e9f532b8d4d795c925a91ed960b37ed1 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 23 Jun 2017 10:00:03 +0100 Subject: [PATCH 12/20] Try to install the previous version of docker --- Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 73d7d8abc..bb02b5bfa 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ venv: .PHONY: dockerengine dockerengine: sudo apt-get -qq update - sudo apt-get -qq install apt-transport-https ca-certificates + sudo apt-get -qq install apt-transport-https ca-certificates software-properties-common sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - sudo bash -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list' + sudo apt-get remove docker docker-engine sudo apt-get -qq update .PHONY: deps @@ -25,9 +25,15 @@ deps: false; \ fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) \ + stable" -sudo apt-get -qq update if [ `lsb_release -rs` = "14.04" ]; then \ - plat_packages="docker.io python3.4-venv"; \ + sudo apt-get install docker-ce=17.05.0~ce-0~ubuntu-$(lsb_release -cs) + plat_packages="linux-image-extra-$(uname -r) linux-image-extra-virtual python3.4-venv"; \ else \ plat_packages="docker.io python3-venv"; \ fi; \ From 44c69ef87eb3d13a378d3b1fdef6d8e34be8b2c9 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 23 Jun 2017 10:05:15 +0100 Subject: [PATCH 13/20] Fix makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bb02b5bfa..0b89b39a2 100644 --- a/Makefile +++ b/Makefile @@ -31,11 +31,11 @@ deps: $(lsb_release -cs) \ stable" -sudo apt-get -qq update + sudo apt-get install docker-ce=17.05.0~ce-0~ubuntu-$(lsb_release -cs) if [ `lsb_release -rs` = "14.04" ]; then \ - sudo apt-get install docker-ce=17.05.0~ce-0~ubuntu-$(lsb_release -cs) plat_packages="linux-image-extra-$(uname -r) linux-image-extra-virtual python3.4-venv"; \ else \ - plat_packages="docker.io python3-venv"; \ + plat_packages="python3-venv"; \ fi; \ sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y $$plat_packages nodejs python3-pip docker --version From 836677e37f2a6f0c889117e71391fcb83436444e Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 23 Jun 2017 10:23:19 +0100 Subject: [PATCH 14/20] Fix docker-ce version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b89b39a2..167106155 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ deps: $(lsb_release -cs) \ stable" -sudo apt-get -qq update - sudo apt-get install docker-ce=17.05.0~ce-0~ubuntu-$(lsb_release -cs) + sudo apt-get install docker-ce=17.03.0~ce-0~ubuntu-$(lsb_release -cs) if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="linux-image-extra-$(uname -r) linux-image-extra-virtual python3.4-venv"; \ else \ From 01aa1874f5ac2b829051ca7c40803475b0e8f1f4 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 23 Jun 2017 10:30:01 +0100 Subject: [PATCH 15/20] Try to fix command --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 167106155..d49513a64 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,10 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + version_name=(shell lsb_release -cs) sudo add-apt-repository \ "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) \ + $(version_name) \ stable" -sudo apt-get -qq update sudo apt-get install docker-ce=17.03.0~ce-0~ubuntu-$(lsb_release -cs) From f62bbca85bfe440e0ca8b16467ee6f8a47c093a6 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 23 Jun 2017 10:49:37 +0100 Subject: [PATCH 16/20] Fix makefile --- Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d49513a64..89f9c4c9d 100644 --- a/Makefile +++ b/Makefile @@ -26,15 +26,14 @@ deps: fi curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - version_name=(shell lsb_release -cs) sudo add-apt-repository \ "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(version_name) \ + `lsb_release -cs` \ stable" -sudo apt-get -qq update - sudo apt-get install docker-ce=17.03.0~ce-0~ubuntu-$(lsb_release -cs) + sudo apt-get install docker-ce=17.03.0~ce-0~ubuntu-`lsb_release -cs` if [ `lsb_release -rs` = "14.04" ]; then \ - plat_packages="linux-image-extra-$(uname -r) linux-image-extra-virtual python3.4-venv"; \ + plat_packages="linux-image-extra-`uname -r` linux-image-extra-virtual python3.4-venv"; \ else \ plat_packages="python3-venv"; \ fi; \ From e0b981b659e106c77b20ab35b2856e8208a02d65 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 23 Jun 2017 10:53:26 +0100 Subject: [PATCH 17/20] Display docker version --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 89f9c4c9d..2e7040833 100644 --- a/Makefile +++ b/Makefile @@ -31,6 +31,7 @@ deps: `lsb_release -cs` \ stable" -sudo apt-get -qq update + docker --version sudo apt-get install docker-ce=17.03.0~ce-0~ubuntu-`lsb_release -cs` if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="linux-image-extra-`uname -r` linux-image-extra-virtual python3.4-venv"; \ From da2a07ed7660a731378c456ec9a36a56c732caea Mon Sep 17 00:00:00 2001 From: martinRenou Date: Fri, 23 Jun 2017 10:55:55 +0100 Subject: [PATCH 18/20] Try --- Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Makefile b/Makefile index 2e7040833..253dfcf0d 100644 --- a/Makefile +++ b/Makefile @@ -31,8 +31,6 @@ deps: `lsb_release -cs` \ stable" -sudo apt-get -qq update - docker --version - sudo apt-get install docker-ce=17.03.0~ce-0~ubuntu-`lsb_release -cs` if [ `lsb_release -rs` = "14.04" ]; then \ plat_packages="linux-image-extra-`uname -r` linux-image-extra-virtual python3.4-venv"; \ else \ From 4494f50b3dd81b8cbb6b411e02ae5b27901c969a Mon Sep 17 00:00:00 2001 From: martinRenou Date: Mon, 26 Jun 2017 11:00:53 +0000 Subject: [PATCH 19/20] Reviews --- Makefile | 20 ++++---------------- doc/source/deployment.rst | 14 +++++--------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index 253dfcf0d..9c253633b 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,6 @@ venv: @echo "----------------------------" python3 -m venv venv -# Only use this on ubuntu-14.04 to retrieve a recent version of docker-engine. The docker.io default shipment with Trusty is -# too old for our software. -.PHONY: dockerengine -dockerengine: - sudo apt-get -qq update - sudo apt-get -qq install apt-transport-https ca-certificates software-properties-common - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D - sudo apt-get remove docker docker-engine - sudo apt-get -qq update - .PHONY: deps deps: @echo "Installing apt dependencies" @@ -24,19 +14,17 @@ deps: echo "ERROR: Cannot run on non-Linux systems"; \ false; \ fi + sudo apt-get remove docker docker-engine curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D sudo add-apt-repository \ "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ `lsb_release -cs` \ stable" -sudo apt-get -qq update - if [ `lsb_release -rs` = "14.04" ]; then \ - plat_packages="linux-image-extra-`uname -r` linux-image-extra-virtual python3.4-venv"; \ - else \ - plat_packages="python3-venv"; \ - fi; \ - sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y $$plat_packages nodejs python3-pip + sudo apt-get -qq install apt-transport-https ca-certificates software-properties-common + sudo apt-get -qq install -o Dpkg::Options::="--force-confold" --force-yes -y linux-image-extra-`uname -r` linux-image-extra-virtual python3.4-venv nodejs python3-pip docker --version node --version npm --version diff --git a/doc/source/deployment.rst b/doc/source/deployment.rst index 9965fa953..b9f90a416 100644 --- a/doc/source/deployment.rst +++ b/doc/source/deployment.rst @@ -18,25 +18,21 @@ Deployment of the complete system in a single machine/VM. #. Make sure that you are obtaining a recent version of Docker, at least 1.12. Full instructions available at `the Docker website `_. A Makefile rule is provided for convenience. **NOTE: this overwrites the docker.list file you might have setup in your - /etc/apt/sources.d/ directory**. You might be prompted for the root password to execute this:: - - make dockerengine - -#. Install dependencies. You might be prompted for the root password to execute this:: + /etc/apt/sources.d/ directory**. You might be prompted for the root password to execute this:: make deps #. Make sure your docker server is running, and your user is allowed to connect to the docker server (check accessibility of `/var/run/docker.sock`). You obtain this by running:: - + sudo service docker start sudo addgroup your_username docker - + and logging out and in again. Check if your docker server is operative by running:: docker info - + #. Create and activate a virtual environment, then set the appropriate PATH for the node modules:: make venv @@ -44,7 +40,7 @@ Deployment of the complete system in a single machine/VM. export PATH=`node bin`:$PATH #. Install the python dependencies:: - + make pythondeps #. And install the package itself:: From f6248776d944741e07f2bd623d333cb221837db4 Mon Sep 17 00:00:00 2001 From: martinRenou Date: Mon, 26 Jun 2017 10:38:56 +0000 Subject: [PATCH 20/20] Review --- .travis.yml | 1 + Makefile | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f353d7715..90ca06b2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ before_install: - firefox --version # Get rid of nvm and thus node installed by travis, which is the incorrect version - rm -rf ~/.nvm + - sudo apt-get remove docker docker-engine - make deps - make pythondeps - python -c "import setuptools; print(setuptools.__version__)" diff --git a/Makefile b/Makefile index 9c253633b..00da5b84a 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,6 @@ deps: echo "ERROR: Cannot run on non-Linux systems"; \ false; \ fi - sudo apt-get remove docker docker-engine curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D