From f19393003c774d1724b868a972a84ebe1f777c54 Mon Sep 17 00:00:00 2001 From: Govinda Fichtner Date: Mon, 9 May 2016 22:35:05 +0200 Subject: [PATCH] update to Docker 1.11 --- builder/build.sh | 2 +- builder/chroot-script.sh | 2 +- .../hypriotos-docker/docker-swarm_spec.rb | 2 +- .../spec/hypriotos-image/device-init_spec.rb | 4 +- .../spec/hypriotos-image/docker_spec.rb | 48 ++++++++++++++----- 5 files changed, 41 insertions(+), 17 deletions(-) diff --git a/builder/build.sh b/builder/build.sh index 58012db..266bd75 100755 --- a/builder/build.sh +++ b/builder/build.sh @@ -34,7 +34,7 @@ export HYPRIOT_IMAGE_VERSION # specific versions of kernel/firmware and docker tools export KERNEL_BUILD="20160404-055934" export KERNEL_VERSION="4.1.20" -export DOCKER_ENGINE_VERSION="1.10.3-1" +export DOCKER_ENGINE_VERSION="1.11.1-1" export DOCKER_COMPOSE_VERSION="1.6.2-28" export DOCKER_MACHINE_VERSION="0.4.1-72" export DEVICE_INIT_VERSION="0.1.5" diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index f955cf8..b707ceb 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -85,7 +85,7 @@ apt-get install -y \ # install hypriot packages for docker-tools apt-get install -y \ - "docker-hypriot=${DOCKER_ENGINE_VERSION}" \ + "docker-engine=${DOCKER_ENGINE_VERSION}" \ "docker-compose=${DOCKER_COMPOSE_VERSION}" \ "docker-machine=${DOCKER_MACHINE_VERSION}" \ "device-init=${DEVICE_INIT_VERSION}" diff --git a/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb b/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb index a47097f..1dd48db 100644 --- a/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb +++ b/builder/test-integration/spec/hypriotos-docker/docker-swarm_spec.rb @@ -10,6 +10,6 @@ end describe command('docker images hypriot/rpi-swarm') do - its(:stdout) { should match /hypriot\/rpi-swarm .*latest .*8cd4dc8bb230 / } + its(:stdout) { should match /hypriot\/rpi-swarm .*latest .*07fafcb46ec6 / } its(:exit_status) { should eq 0 } end diff --git a/builder/test-integration/spec/hypriotos-image/device-init_spec.rb b/builder/test-integration/spec/hypriotos-image/device-init_spec.rb index a8ae9f1..a5d9dd8 100644 --- a/builder/test-integration/spec/hypriotos-image/device-init_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/device-init_spec.rb @@ -6,7 +6,7 @@ describe command('dpkg -l device-init') do its(:stdout) { should match /ii device-init/ } - its(:stdout) { should match /0.1.4/ } + its(:stdout) { should match /0.1.5/ } its(:exit_status) { should eq 0 } end @@ -16,7 +16,7 @@ its(:content) { should match /docker:/ } its(:content) { should match /images:/ } its(:content) { should match /- "\/var\/local\/rpi-consul_v0\.6\.4\.tar.gz"/ } - its(:content) { should match /- "\/var\/local\/rpi-swarm_v1.2\.0\.tar\.gz"/ } + its(:content) { should match /- "\/var\/local\/rpi-swarm_v1.2\.1\.tar\.gz"/ } end describe file('/usr/local/bin/device-init') do diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index 878643b..11d328f 100644 --- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/docker_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' -describe package('docker-hypriot') do +describe package('docker-engine') do it { should be_installed } end -describe command('dpkg -l docker-hypriot') do - its(:stdout) { should match /ii docker-hypriot/ } - its(:stdout) { should match /1.10.3-1/ } +describe command('dpkg -l docker-engine') do + its(:stdout) { should match /ii docker-engine/ } + its(:stdout) { should match /1.11.1-1/ } its(:exit_status) { should eq 0 } end @@ -16,28 +16,52 @@ it { should be_owned_by 'root' } end -describe file('/usr/lib/docker/dockerinit') do +describe file('/usr/bin/docker-containerd') do it { should be_file } it { should be_mode 755 } it { should be_owned_by 'root' } end -describe file('/etc/init.d/docker') do +describe file('/usr/bin/docker-containerd-ctr') do it { should be_file } it { should be_mode 755 } it { should be_owned_by 'root' } end +describe file('/usr/bin/docker-containerd-shim') do + it { should be_file } + it { should be_mode 755 } + it { should be_owned_by 'root' } +end + +describe file('/usr/bin/docker-runc') do + it { should be_file } + it { should be_mode 755 } + it { should be_owned_by 'root' } +end + +describe file('/lib/systemd/system/docker.service') do + it { should be_file } + it { should be_mode 644 } + it { should be_owned_by 'root' } +end + +describe file('/lib/systemd/system/docker.socket') do + it { should be_file } + it { should be_mode 644 } + it { should be_owned_by 'root' } +end + describe file('/etc/default/docker') do it { should be_file } it { should be_mode 644 } it { should be_owned_by 'root' } - its(:content) { should match /--storage-driver=overlay/ } +# its(:content) { should match /--storage-driver=overlay/ } end describe file('/var/lib/docker') do it { should be_directory } - it { should be_mode 701 } + it { should be_mode 711 } it { should be_owned_by 'root' } end @@ -49,19 +73,19 @@ describe file('/etc/bash_completion.d/docker') do it { should be_file } - it { should be_mode 755 } + it { should be_mode 644 } it { should be_owned_by 'root' } it { should be_file } end describe command('docker -v') do - its(:stdout) { should match /Docker version 1.10.3, build/ } + its(:stdout) { should match /Docker version 1.11.1, build/ } its(:exit_status) { should eq 0 } end describe command('docker version') do - its(:stdout) { should match /Client:. Version: 1.10.3. API version: 1.22/m } - its(:stdout) { should match /Server:. Version: 1.10.3. API version: 1.22/m } + its(:stdout) { should match /Client:. Version: 1.11.1. API version: 1.23/m } + its(:stdout) { should match /Server:. Version: 1.11.1. API version: 1.23/m } its(:exit_status) { should eq 0 } end