Merge pull request #55 from DieterReuter/update-docker-ce-17.12-0

Update Docker 17.12.0-ce (built for Debian Stretch ARM64)

builder/chroot-script.sh

@@ -236,17 +236,10 @@ echo '{
 }
 ' > /etc/docker/daemon.json
 
-#TODO: Install Docker CE later for Debian Jessie
-
-echo "Installing rpi-serial-console script"
-wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
-chmod +x usr/local/bin/rpi-serial-console
-
 #TODO:+++ change to Debian Stretch official repo, as soon as it's available
-# install Docker CE directly from Docker APT Repo but built for Ubuntu Xenial,
-# because currently it's the only available build for ARM64
-DOCKER_DEB="docker-ce_${DOCKER_ENGINE_VERSION}-0~ubuntu_arm64.deb"
-curl -sSL "https://download.docker.com/linux/ubuntu/dists/xenial/pool/edge/arm64/$DOCKER_DEB" \
+# install Docker CE directly from Docker APT Repo but built for Debian Stretch ARM64
+DOCKER_DEB="docker-ce_${DOCKER_ENGINE_VERSION}-0~debian_arm64.deb"
+curl -sSL "https://download.docker.com/linux/debian/dists/stretch/pool/edge/arm64/$DOCKER_DEB" \
   > "/$DOCKER_DEB"
 if [ -f "/$DOCKER_DEB" ]; then
   # install some runtime requirements for Docker CE
@@ -261,6 +254,10 @@ if [ -f "/$DOCKER_DEB" ]; then
 fi
 #TODO:---
 
+echo "Installing rpi-serial-console script"
+wget -q https://raw.githubusercontent.com/lurch/rpi-serial-console/master/rpi-serial-console -O usr/local/bin/rpi-serial-console
+chmod +x usr/local/bin/rpi-serial-console
+
 # cleanup APT cache and lists
 apt-get clean
 rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

builder/test-integration/spec/hypriotos-image/docker_spec.rb

@@ -6,7 +6,7 @@
 
 describe command('dpkg -l docker-ce') do
   its(:stdout) { should match /ii  docker-ce/ }
-  its(:stdout) { should match /17.11.0~ce-0~ubuntu/ }
+  its(:stdout) { should match /17.12.0~ce-0~debian/ }
   its(:stdout) { should match /arm64/ }
   its(:exit_status) { should eq 0 }
 end
@@ -73,13 +73,7 @@
 end
 
 describe command('docker -v') do
-  its(:stdout) { should match /Docker version 17.11.0-ce, build/ }
-  its(:exit_status) { should eq 0 }
-end
-
-describe command('docker version') do
-  its(:stdout) { should match /Client:. Version:      17.11.0-ce. API version:  1.34/m }
-  its(:stdout) { should match /Server:. Version:      17.11.0-ce. API version:  1.34/m }
+  its(:stdout) { should match /Docker version 17.12.0-ce, build/ }
   its(:exit_status) { should eq 0 }
 end
 

versions.config

@@ -11,6 +11,6 @@ RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1
 export BOOTLOADER_BUILD="20180107-135241"
 export KERNEL_BUILD="20180107-140909"
 export KERNEL_VERSION="4.9.73"
-export DOCKER_ENGINE_VERSION="17.11.0~ce"
+export DOCKER_ENGINE_VERSION="17.12.0~ce"
 export DOCKER_COMPOSE_VERSION="1.18.0"
 export DOCKER_MACHINE_VERSION="0.13.0"