Merge pull request #32 from docbobo/feature/docker-compose

Fixed docker-machine installation.

Author: docbobo

builder/chroot-script.sh

@@ -50,7 +50,7 @@ apt-get -y install --no-install-recommends ${packages[*]}
 pip install docker-compose=="${DOCKER_COMPOSE_VERSION}"
 
 # install docker-machine
-curl -L "https://github.com/docker/machine/releases/download/v${DOCKER_MACHINE_VERSION}/docker-machine-$(uname -s)-$(uname -m)" > /usr/local/bin/docker-machine
+curl -L "https://github.com/docker/machine/releases/download/v${DOCKER_MACHINE_VERSION}/docker-machine-$(uname -s)-$(dpkg --print-architecture)" > /usr/local/bin/docker-machine
 chmod +x /usr/local/bin/docker-machine
 
 # install ODROID kernel

builder/test-integration/spec/hypriotos-image/base/packages_spec.rb

@@ -51,7 +51,7 @@
 describe package('initramfs-tools') do
   it { should be_installed }
 end
-describe package('linux-image-c1') do
+describe package('linux-image-3.10.104-186') do
   it { should be_installed }
 end
 
@@ -62,9 +62,3 @@
 describe package('docker-engine') do
   it { should be_installed }
 end
-describe package('docker-compose') do
-  it { should be_installed }
-end
-describe package('docker-machine') do
-  it { should be_installed }
-end

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

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe package('docker-compose') do
-  it { should be_installed }
-end
-
-describe command('dpkg -l docker-compose') do
   it { should_not be_installed }
 end
 

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

@@ -1,10 +1,6 @@
 require 'spec_helper'
 
 describe package('docker-machine') do
-  it { should be_installed }
-end
-
-describe command('dpkg -l docker-machine') do
   it { should_not be_installed }
 end