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 #317 from hypriot/raw-image-032
Browse files Browse the repository at this point in the history
Use raw image 0.3.2 with bigger SD card size
  • Loading branch information
StefanScherer authored Sep 16, 2019
2 parents b880331 + 6903c65 commit f928d0a
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
require 'spec_helper'

describe command('docker pull hypriot/rpi-busybox-httpd:0.1.0') do
describe command('docker pull hypriot/rpi-busybox-httpd:0.5') do
its(:exit_status) { should eq 0 }
end

describe command('docker run -t --rm hypriot/rpi-busybox-httpd:0.1.0 busybox') do
describe command('docker run -t --rm hypriot/rpi-busybox-httpd:0.5 busybox') do
its(:stdout) { should match /BusyBox v1.20.2/ }
its(:exit_status) { should eq 0 }
end

describe command('docker run -t --rm hypriot/rpi-busybox-httpd:0.1.0 busybox httpd') do
describe command('docker run -t --rm hypriot/rpi-busybox-httpd:0.5 busybox httpd') do
its(:exit_status) { should eq 0 }
end
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
require 'spec_helper'

describe command('docker pull hypriot/rpi-node:0.12.0') do
describe command('docker pull node:10.16.3-slim') do
its(:exit_status) { should eq 0 }
end

describe command('docker run -t --rm hypriot/rpi-node:0.12.0 node --version') do
its(:stdout) { should match /v0.12.0/ }
describe command('docker run -t --rm node:10.16.3-slim node --version') do
its(:stdout) { should match /v10.16.3/ }
# its(:stderr) { should match /^$/ }
its(:exit_status) { should eq 0 }
end
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
require 'spec_helper'

describe command('uname -r') do
its(:stdout) { should match /4.19.58(-v7)?+/ }
its(:stdout) { should match /4.19.66(-v7)?+/ }
its(:exit_status) { should eq 0 }
end

describe file('/lib/modules/4.19.58+/kernel') do
describe file('/lib/modules/4.19.66+/kernel') do
it { should be_directory }
end

describe file('/lib/modules/4.19.58-v7+/kernel') do
describe file('/lib/modules/4.19.66-v7+/kernel') do
it { should be_directory }
end
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
end

describe command('docker-machine --version') do
its(:stdout) { should match /0.16.1/m }
its(:stdout) { should match /0.16.2/m }
its(:exit_status) { should eq 0 }
end

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 @@ -14,7 +14,7 @@

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

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

describe command('docker version') do
its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.0. API version: 1.40/m }
its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.0. API version: 1.40/m }
its(:stdout) { should match /Client: Docker Engine - Community. Version: 19.03.2. API version: 1.40/m }
its(:stdout) { should match /Server: Docker Engine - Community. Engine:. Version: 19.03.2. API version: 1.40/m }
its(:exit_status) { should eq 0 }
end

Expand Down
6 changes: 3 additions & 3 deletions versions.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ ROOTFS_TAR_CHECKSUM="bbd035543c8cf0fd874a9723e6c174d939f7e528e3aeb954b5affeec896

# name of the ready made raw image for RPi
RAW_IMAGE="rpi-raw.img"
RAW_IMAGE_VERSION="v0.3.1"
RAW_IMAGE_CHECKSUM="ccff10498fb45fb76c6064988fb01b3543adfdb70ee7e5fb04b51885573684a6"
RAW_IMAGE_VERSION="v0.3.2"
RAW_IMAGE_CHECKSUM="cd66db11608f910b7b18f0e1d5f7943f10d54bacc1fa1dcc526a442a115c4a5a"

# specific versions of kernel/firmware and docker tools
export KERNEL_BUILD="1.20190819-1"
# For testing a new kernel, use the CircleCI artifacts URL.
# 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.19.58"
# export KERNEL_VERSION="4.19.66"
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
export DOCKER_CE_VERSION="5:19.03.2~3-0~raspbian-buster"
export DOCKER_COMPOSE_VERSION="1.23.2"
Expand Down

0 comments on commit f928d0a

Please sign in to comment.