Fix build 2.0

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
-	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 -qq update
-
 .PHONY: deps
 deps:
 	@echo "Installing apt dependencies"
@@ -24,14 +14,18 @@ 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="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 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
 	npm install

doc/source/deployment.rst

@@ -18,33 +18,29 @@ 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 <https://docs.docker.com/engine/installation/linux/ubuntulinux/>`_.
    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
      . venv/bin/activate
      export PATH=`node bin`:$PATH
 
 #. Install the python dependencies::
-    
+
      make pythondeps
 
 #. And install the package itself::