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 #195 from hypriot/update-docker-ce-17.10-0
Browse files Browse the repository at this point in the history
Update Docker 17.10.0-ce
  • Loading branch information
DieterReuter authored Nov 1, 2017
2 parents b603845 + 90aaf05 commit 201a783
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
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
8 changes: 4 additions & 4 deletions builder/test-integration/spec/hypriotos-image/docker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion versions.config
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit 201a783

Please sign in to comment.