Merge branch 'master' into master

Author: brahmlower

.travis.yml

@@ -5,8 +5,7 @@ services:
   - docker
 env:
   global:
-    - DOCKER_VERSION=1.10.2-0~trusty
-    - DOCKER_COMPOSE_VERSION=1.6.2
+    - DOCKER_COMPOSE_VERSION=1.17.1
   matrix:
     - OS=jessie64 SERVER=minecraft PROCESS_CONTROL=systemd
     - OS=jessie64 SERVER=minecraft PROCESS_CONTROL=supervisor

scripts/install-docker.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-apt-get -o Dpkg::Options::="--force-confnew" install --force-yes -y docker-engine="${DOCKER_VERSION}"
+apt-get install --force-yes -y docker-ce
 
 curl -L "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-$(uname -s)-$(uname -m)" > /usr/local/bin/docker-compose
 chmod +x /usr/local/bin/docker-compose