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

Commit f928d0a

Browse files
Merge pull request #317 from hypriot/raw-image-032
Use raw image 0.3.2 with bigger SD card size
2 parents b880331 + 6903c65 commit f928d0a

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
require 'spec_helper'
22

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

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

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

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

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

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

8-
describe file('/lib/modules/4.19.58+/kernel') do
8+
describe file('/lib/modules/4.19.66+/kernel') do
99
it { should be_directory }
1010
end
1111

12-
describe file('/lib/modules/4.19.58-v7+/kernel') do
12+
describe file('/lib/modules/4.19.66-v7+/kernel') do
1313
it { should be_directory }
1414
end

builder/test-integration/spec/hypriotos-image/docker-machine_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
end
88

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

builder/test-integration/spec/hypriotos-image/docker_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
describe command('dpkg -l docker-ce') do
1616
its(:stdout) { should match /ii docker-ce/ }
17-
its(:stdout) { should match /5:19.03.0~3-0~raspbian/ }
17+
its(:stdout) { should match /5:19.03.2~3-0~raspbian/ }
1818
its(:stdout) { should match /armhf/ }
1919
its(:exit_status) { should eq 0 }
2020
end
@@ -87,13 +87,13 @@
8787
end
8888

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

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

versions.config

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ ROOTFS_TAR_CHECKSUM="bbd035543c8cf0fd874a9723e6c174d939f7e528e3aeb954b5affeec896
44

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

1010
# specific versions of kernel/firmware and docker tools
1111
export KERNEL_BUILD="1.20190819-1"
1212
# For testing a new kernel, use the CircleCI artifacts URL.
1313
# export KERNEL_URL=https://62-32913687-gh.circle-artifacts.com/0/home/circleci/project/output/20180320-092128/raspberrypi-kernel_20180320-092128_armhf.deb
14-
# export KERNEL_VERSION="4.19.58"
14+
# export KERNEL_VERSION="4.19.66"
1515
export DOCKER_CE_CHANNEL="stable" # stable, test or edge
1616
export DOCKER_CE_VERSION="5:19.03.2~3-0~raspbian-buster"
1717
export DOCKER_COMPOSE_VERSION="1.23.2"

0 commit comments

Comments
 (0)