From 478684f9581a42dc4b6590ff4b996a4038f93853 Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Sun, 31 Jul 2016 10:53:57 +0200 Subject: [PATCH 1/2] Force overriding the tar.gz This is to avoid an interactive question if you're build the image locally in a Vagrantbox. With the flag `-f` gzip will just override the tar.gz without manual interuption. Signed-off-by: Dieter Reuter --- builder/get-cluster-lab-images.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/get-cluster-lab-images.sh b/builder/get-cluster-lab-images.sh index 91b31c7..7b41b94 100755 --- a/builder/get-cluster-lab-images.sh +++ b/builder/get-cluster-lab-images.sh @@ -5,9 +5,9 @@ source versions.config || source ../versions.config # pull save and zip consul docker pull hypriot/rpi-consul:"${CONSUL_VERSION}" docker save --output=builder/files/var/local/rpi-consul_"${CONSUL_VERSION}".tar hypriot/rpi-consul:"${CONSUL_VERSION}" -gzip builder/files/var/local/rpi-consul_"${CONSUL_VERSION}".tar +gzip -f builder/files/var/local/rpi-consul_"${CONSUL_VERSION}".tar # pull save and zip swarm docker pull hypriot/rpi-swarm:"${SWARM_VERSION}" docker save --output=builder/files/var/local/rpi-swarm_"${SWARM_VERSION}".tar hypriot/rpi-swarm:"${SWARM_VERSION}" -gzip builder/files/var/local/rpi-swarm_"${SWARM_VERSION}".tar +gzip -f builder/files/var/local/rpi-swarm_"${SWARM_VERSION}".tar From 53bee9e63f905d1a92d8056cfc64b47b4b11da7d Mon Sep 17 00:00:00 2001 From: Dieter Reuter Date: Sat, 13 Aug 2016 14:36:37 +0200 Subject: [PATCH 2/2] Add package lsb-release to fully support Docker install.sh Signed-off-by: Dieter Reuter --- builder/chroot-script.sh | 4 ++++ .../spec/hypriotos-image/base/packages_spec.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index 4221ff1..2fb5a5f 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -181,6 +181,10 @@ apt-get install -y \ bluetooth \ pi-bluetooth +# ensure compatibility with Docker install.sh, so `raspbian` will be detected correctly +apt-get install -y \ + lsb-release + # install hypriot packages for docker-tools apt-get install -y \ "docker-hypriot=${DOCKER_ENGINE_VERSION}" \ diff --git a/builder/test-integration/spec/hypriotos-image/base/packages_spec.rb b/builder/test-integration/spec/hypriotos-image/base/packages_spec.rb index 02f5e22..192db47 100644 --- a/builder/test-integration/spec/hypriotos-image/base/packages_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/base/packages_spec.rb @@ -42,6 +42,10 @@ it { should be_installed } end +describe package('lsb-release') do + it { should be_installed } +end + describe package('wpasupplicant') do it { should be_installed } end