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

Updated docker-compose & docker-machine

builder/chroot-script.sh

@@ -21,26 +21,45 @@ echo 'deb [arch=armhf] https://apt.dockerproject.org/repo debian-jessie main' >
 
 # update all apt repository lists
 export DEBIAN_FRONTEND=noninteractive
-apt-get update 
-apt-get upgrade -y 
+apt-get update
+apt-get upgrade -y
 
-# ---install Docker tools---
-apt-get install -y \
-  fake-hwclock \
-  device-init="${DEVICE_INIT_VERSION}" \
-  cgroupfs-mount \
-  cgroup-bin \
-  libltdl7 \
-  docker-engine="${DOCKER_ENGINE_VERSION}" \
-  docker-compose="${DOCKER_COMPOSE_VERSION}" \
-  docker-machine="${DOCKER_MACHINE_VERSION}" 
+# define packages to install
+packages=(
+    # as the Odroid C1/C1+ does not have a hardware clock we need a fake one
+    fake-hwclock
+
+    # install device-init
+    device-init=${DEVICE_INIT_VERSION}
+
+    # install dependencies for docker-tools
+    cgroupfs-mount \
+    cgroup-bin \
+    libltdl7 \
+
+    # required to install docker-compose
+    python-pip
+
+    # install docker-engine, docker-machine
+    docker-engine="${DOCKER_ENGINE_VERSION}"
+)
+
+apt-get -y install --no-install-recommends ${packages[*]}
+
+# install docker-compose
+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
+chmod +x /usr/local/bin/docker-machine
 
 # install ODROID kernel
 touch /boot/uImage
 apt-get install -y \
-  u-boot-tools \
-  initramfs-tools \
-  linux-image-c1="${KERNEL_VERSION}"
+    --no-install-recommends \
+    u-boot-tools \
+    initramfs-tools \
+    linux-image-"${KERNEL_VERSION}"
 
 # cleanup APT cache and lists
 apt-get clean

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
 describe command('uname -r') do
-  its(:stdout) { should match /3.10.104-185/ }
+  its(:stdout) { should match /3.10.104-186/ }
   its(:exit_status) { should eq 0 }
 end

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

@@ -5,9 +5,7 @@
 end
 
 describe command('dpkg -l docker-compose') do
-  its(:stdout) { should match /ii  docker-compose/ }
-  its(:stdout) { should match /1.9.0-23/ }
-  its(:exit_status) { should eq 0 }
+  it { should_not be_installed }
 end
 
 describe file('/usr/local/bin/docker-compose') do
@@ -17,6 +15,6 @@
 end
 
 describe command('docker-compose --version') do
-  its(:stdout) { should match /1.9.0/m }
+  its(:stdout) { should match /1.11.2/m }
   its(:exit_status) { should eq 0 }
 end

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

@@ -5,9 +5,7 @@
 end
 
 describe command('dpkg -l docker-machine') do
-  its(:stdout) { should match /ii  docker-machine/ }
-  its(:stdout) { should match /0.9.0-39/ }
-  its(:exit_status) { should eq 0 }
+  it { should_not be_installed }
 end
 
 describe file('/usr/local/bin/docker-machine') do
@@ -17,6 +15,6 @@
 end
 
 describe command('docker-machine --version') do
-  its(:stdout) { should match /0.9.0/m }
+  its(:stdout) { should match /0.10.0/m }
   its(:exit_status) { should eq 0 }
 end

versions.config

@@ -8,8 +8,8 @@ RAW_IMAGE_VERSION="v0.2.2"
 RAW_IMAGE_CHECKSUM="fe9af7686960d5d2dd6c364197e196d751f6adedd7da515ed6521c31e9582f8a"
 
 # specific versions of kernel/firmware and docker tools
-export KERNEL_VERSION="185-1"
+export KERNEL_VERSION="3.10.104-186"
 export DOCKER_ENGINE_VERSION="17.03.0~ce-0~debian-jessie"
-export DOCKER_COMPOSE_VERSION="1.9.0-23"
-export DOCKER_MACHINE_VERSION="0.9.0-39"
+export DOCKER_COMPOSE_VERSION="1.11.2"
+export DOCKER_MACHINE_VERSION="0.10.0"
 export DEVICE_INIT_VERSION="0.1.9"