Uplift of Docker versions

The Docker version 1.5.0 is no longer allowed to acces the
Docker remote image repository!

Switching to version 1.7.1 instead.

Change-Id: Id71cab4b26a02e98a3bb51f31caa394bcf25b7d9
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>

diff --git a/build/Makefile b/build/Makefile
index 85da6eb..5422696 100644 (file)
--- a/build/Makefile
+++ b/build/Makefile
@@ -91,6 +91,10 @@ $(ISOCACHE):
        # Fuel build.
        sudo rm -f /etc/apt/apt.conf.d/docker*
        #
+       # Need to replace the old Docker v. 1.5.0 with a later version to be
+       # able to access the Docker remote repository!
+       cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_docker_version.patch
+       #
        cd /tmp/fuel-main && ./prepare-build-env.sh
        cd /tmp/fuel-main && make repos
        $(REPOINFO) -r /tmp/fuel-main > gitinfo_fuel.txt

diff --git a/build/f_isoroot/f_qemupluginbuild/install_docker.sh b/build/f_isoroot/f_qemupluginbuild/install_docker.sh
index 02acce2..eeb80e3 100755 (executable)
--- a/build/f_isoroot/f_qemupluginbuild/install_docker.sh
+++ b/build/f_isoroot/f_qemupluginbuild/install_docker.sh
@@ -23,5 +23,5 @@ else
   sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
   # Install docker
   sudo apt-get update
-  sudo apt-get -y install lxc-docker-1.5.0
+  sudo apt-get -y install lxc-docker-1.7.1
 fi

diff --git a/build/fuel-main_docker_version.patch b/build/fuel-main_docker_version.patch
new file mode 100644 (file)
index 0000000..2976675
--- /dev/null
+++ b/build/fuel-main_docker_version.patch
@@ -0,0 +1,19 @@
+*** prepare-build-env.sh.orig  Fri Dec 18 15:04:43 2015
+--- prepare-build-env.sh       Fri Dec 18 15:05:01 2015
+***************
+*** 104,110 ****
+    # Install docker
+    sudo apt-get update
+    sudo sh -c 'echo DOCKER_OPTS=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" > /etc/default/docker'
+!   sudo apt-get -y -o Dpkg::Options::="--force-confold" install lxc-docker-1.5.0
+  fi
+  
+  # Install software
+--- 104,110 ----
+    # Install docker
+    sudo apt-get update
+    sudo sh -c 'echo DOCKER_OPTS=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" > /etc/default/docker'
+!   sudo apt-get -y -o Dpkg::Options::="--force-confold" install lxc-docker-1.7.1
+  fi
+  
+  # Install software