From a47caa671b834e6cd0afd755677ca6a224c76496 Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Thu, 18 Aug 2016 22:34:48 +0200 Subject: [PATCH] Update to official Docker Engine 1.12.1 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 1475581..49c914e 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -190,7 +190,7 @@ apt-get install -y \ # set up Docker APT repository and install docker-engine package #TODO: pin package version to ${DOCKER_ENGINE_VERSION} -curl -sSL https://test.docker.com | /bin/sh +curl -sSL https://get.docker.com | /bin/sh echo "Installing rpi-serial-console script" diff --git a/builder/test-integration/spec/hypriotos-image/docker_spec.rb b/builder/test-integration/spec/hypriotos-image/docker_spec.rb index 8028ae2..9d52786 100644 --- a/builder/test-integration/spec/hypriotos-image/docker_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/docker_spec.rb @@ -6,7 +6,7 @@ describe command('dpkg -l docker-engine') do its(:stdout) { should match /ii docker-engine/ } - its(:stdout) { should match /1.12.1~rc2-0~jessie/ } + its(:stdout) { should match /1.12.1-0~jessie/ } its(:exit_status) { should eq 0 } end @@ -86,13 +86,13 @@ end describe command('docker -v') do - its(:stdout) { should match /Docker version 1.12.1-rc2, build/ } + its(:stdout) { should match /Docker version 1.12.1, build/ } its(:exit_status) { should eq 0 } end describe command('docker version') do - its(:stdout) { should match /Client:. Version: 1.12.1-rc2. API version: 1.24/m } - its(:stdout) { should match /Server:. Version: 1.12.1-rc2. API version: 1.24/m } + its(:stdout) { should match /Client:. Version: 1.12.1. API version: 1.24/m } + its(:stdout) { should match /Server:. Version: 1.12.1. API version: 1.24/m } its(:exit_status) { should eq 0 } end diff --git a/versions.config b/versions.config index da0c595..81a5059 100644 --- a/versions.config +++ b/versions.config @@ -10,7 +10,7 @@ RAW_IMAGE_CHECKSUM="2fbeb13b7b0f2308dbd0d82780b54c33003ad43d145ff08498b25fb8bbe1 # specific versions of kernel/firmware and docker tools export KERNEL_BUILD="20160725-081443" export KERNEL_VERSION="4.4.15" -export DOCKER_ENGINE_VERSION="1.12.1~rc1-0~jessie" +export DOCKER_ENGINE_VERSION="1.12.1-0~jessie" export DOCKER_COMPOSE_VERSION="1.8.0-61" export DOCKER_MACHINE_VERSION="0.8.0-30" export DEVICE_INIT_VERSION="0.1.8"