From 90aaf05eb37ab7389e8da2adf4931fe71c398f5b Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Wed, 1 Nov 2017 19:20:13 +0100 Subject: [PATCH] Update Docker 17.10.0-ce Signed-off-by: Dieter Reuter --- builder/chroot-script.sh | 2 +- .../test-integration/spec/hypriotos-image/docker_spec.rb | 8 ++++---- versions.config | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 25913e1..aae0355 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -109,7 +109,7 @@ 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 +CHANNEL=edge # stable, test or edge echo "deb [arch=armhf] https://download.docker.com/linux/raspbian jessie $CHANNEL" > /etc/apt/sources.list.d/docker.list diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index 83b5700..4a15753 100644 --- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/docker_spec.rb @@ -10,7 +10,7 @@ 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 /17.10.0~ce-0~raspbian/ } its(:stdout) { should match /armhf/ } its(:exit_status) { should eq 0 } end @@ -84,13 +84,13 @@ end describe command('docker -v') do - its(:stdout) { should match /Docker version 17.09.0-ce, build/ } + its(:stdout) { should match /Docker version 17.10.0-ce, build/ } its(:exit_status) { should eq 0 } end describe command('docker version') do - 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(:stdout) { should match /Client:. Version: 17.10.0-ce. API version: 1.33/m } + its(:stdout) { should match /Server:. Version: 17.10.0-ce. API version: 1.33/m } its(:exit_status) { should eq 0 } end diff --git a/versions.config b/versions.config index dac360e..7582f77 100644 --- a/versions.config +++ b/versions.config @@ -10,6 +10,6 @@ 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_CE_VERSION="17.10.0~ce-0~raspbian" export DOCKER_COMPOSE_VERSION="1.16.1" export DOCKER_MACHINE_VERSION="0.13.0"