Merge pull request #118 from hypriot/add-package-lsb-release

Add package lsb-release to fully support Docker install.sh
hypriot · Aug 13, 2016 · 533eaa4 · 533eaa4
2 parents 4cde079 + 53bee9e
commit 533eaa4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git 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/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
diff --git 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