Navigation Menu

Skip to content
This repository has been archived by the owner on Aug 14, 2023. It is now read-only.

Commit

Permalink
Merge pull request #130 from hypriot/update-docker-engine-to-1.12.1
Browse files Browse the repository at this point in the history
Update to official Docker Engine 1.12.1
  • Loading branch information
DieterReuter committed Aug 18, 2016
2 parents 7f9a12e + a47caa6 commit a31e6bb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion builder/chroot-script.sh
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions builder/test-integration/spec/hypriotos-image/docker_spec.rb
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion versions.config
Expand Up @@ -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"

0 comments on commit a31e6bb

Please sign in to comment.