Merge pull request #184 from hypriot/install-docker-ce-17.09-0

Update Docker 17.09.0-ce

Vagrantfile

@@ -1,5 +1,6 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
+ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
 
 Vagrant.configure(2) do |config|
   config.vm.box = "boxcutter/ubuntu1404"

builder/chroot-script.sh

@@ -104,6 +104,14 @@ echo 'deb https://packagecloud.io/Hypriot/rpi/debian/ jessie main' > /etc/apt/so
 # set up hypriot schatzkiste repository for generic packages
 echo 'deb https://packagecloud.io/Hypriot/Schatzkiste/debian/ jessie main' >> /etc/apt/sources.list.d/hypriot.list
 
+# set up Docker CE repository
+DOCKERREPO_FPR=9DC858229FC7DD38854AE2D88D81803C0EBFCD88
+DOCKERREPO_KEY_URL=https://download.docker.com/linux/raspbian/gpg
+get_gpg "${DOCKERREPO_FPR}" "${DOCKERREPO_KEY_URL}"
+
+CHANNEL=stable # stable, test or edge
+echo "deb [arch=armhf] https://download.docker.com/linux/raspbian jessie $CHANNEL" > /etc/apt/sources.list.d/docker.list
+
 
 RPI_ORG_FPR=CF8A1AF502A2AA2D763BAE7E82B129927FA3303E RPI_ORG_KEY_URL=http://archive.raspberrypi.org/debian/raspberrypi.gpg.key
 get_gpg "${RPI_ORG_FPR}" "${RPI_ORG_KEY_URL}"
@@ -203,8 +211,9 @@ apt-get install -y \
   python-pip
 pip install "docker-compose==${DOCKER_COMPOSE_VERSION}"
 
-# set up Docker APT repository and install docker-engine package
-curl -sSL https://get.docker.com | /bin/sh
+# install docker-ce (w/ install-recommends)
+apt-get install -y --force-yes \
+  "docker-ce=${DOCKER_CE_VERSION}"
 
 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

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

@@ -1,12 +1,17 @@
 require 'spec_helper'
 
 describe package('docker-engine') do
+  it { should_not be_installed }
+end
+
+describe package('docker-ce') do
   it { should be_installed }
 end
 
-describe command('dpkg -l docker-engine') do
-  its(:stdout) { should match /ii  docker-engine/ }
-  its(:stdout) { should match /17.05.0~ce-0~raspbian-jessie/ }
+describe command('dpkg -l docker-ce') do
+  its(:stdout) { should match /ii  docker-ce/ }
+  its(:stdout) { should match /17.09.0~ce-0~raspbian/ }
+  its(:stdout) { should match /armhf/ }
   its(:exit_status) { should eq 0 }
 end
 
@@ -79,13 +84,13 @@
 end
 
 describe command('docker -v') do
-  its(:stdout) { should match /Docker version 17.05.0-ce, build/ }
+  its(:stdout) { should match /Docker version 17.09.0-ce, build/ }
   its(:exit_status) { should eq 0 }
 end
 
 describe command('docker version') do
-  its(:stdout) { should match /Client:. Version:      17.05.0-ce. API version:  1.29/m }
-  its(:stdout) { should match /Server:. Version:      17.05.0-ce. API version:  1.29/m }
+  its(:stdout) { should match /Client:. Version:      17.09.0-ce. API version:  1.32/m }
+  its(:stdout) { should match /Server:. Version:      17.09.0-ce. API version:  1.32/m }
   its(:exit_status) { should eq 0 }
 end
 

versions.config

@@ -10,6 +10,7 @@ RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1
 # specific versions of kernel/firmware and docker tools
 export KERNEL_BUILD="20170319-133405"
 export KERNEL_VERSION="4.4.50"
+export DOCKER_CE_VERSION="17.09.0~ce-0~raspbian"
 export DOCKER_MACHINE_VERSION="0.12.2"
 export DOCKER_COMPOSE_VERSION="1.16.1"
 export DEVICE_INIT_VERSION="0.1.9"