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 #275 from hypriot/downgrade-18.06.1
Browse files Browse the repository at this point in the history
Downgrade to 18.06.1 to support all RPi models
  • Loading branch information
StefanScherer authored Jan 6, 2019
2 parents b53a8b0 + 46e7fec commit c5beaa9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions builder/test-integration/spec/hypriotos-image/docker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
end

describe package('docker-ce-cli') do
it { should be_installed }
it { should_not be_installed }
end

describe command('dpkg -l docker-ce') do
its(:stdout) { should match /ii docker-ce/ }
its(:stdout) { should match /5:18.09.0~3-0~raspbian-stretch/ }
its(:stdout) { should match /18.06.1~ce~3-0~raspbian/ }
its(:stdout) { should match /armhf/ }
its(:exit_status) { should eq 0 }
end
Expand Down Expand Up @@ -75,13 +75,13 @@
end

describe command('docker -v') do
its(:stdout) { should match /Docker version 18.09.0, build/ }
its(:stdout) { should match /Docker version 18.06.1-ce, build/ }
its(:exit_status) { should eq 0 }
end

describe command('docker version') do
its(:stdout) { should match /Client:. Version: 18.09.0. API version: 1.39/m }
its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 18.09.0. API version: 1.39/m }
its(:stdout) { should match /Client:. Version: 18.06.1-ce. API version: 1.38/m }
its(:stdout) { should match /Server:. Engine:. Version: 18.06.1-ce. API version: 1.38/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 @@ -13,6 +13,6 @@ export KERNEL_BUILD="1.20181112-1"
# export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
export KERNEL_VERSION="4.14.79"
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
export DOCKER_CE_VERSION="5:18.09.0~3-0~raspbian-stretch"
export DOCKER_CE_VERSION="18.06.1~ce~3-0~raspbian"
export DOCKER_COMPOSE_VERSION="1.23.2"
export DOCKER_MACHINE_VERSION="0.16.0"

0 comments on commit c5beaa9

Please sign in to comment.