Move install_docker.sh to common place

1. copy install_docker.sh in qemu plugin to docker/ubuntu-builder
2. change docker build in ovs & qemu

Change-Id: I3c0143e5e1b10a1cf798592d8bc05a49a5d12d48
Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>

diff --git a/build/f_isoroot/f_qemupluginbuild/install_docker.sh b/build/docker/ubuntu-builder/install_docker.sh
similarity index 100%
rename from build/f_isoroot/f_qemupluginbuild/install_docker.sh
rename to build/docker/ubuntu-builder/install_docker.sh

diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index 89af75b..700a93c 100644 (file)
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@ -37,7 +37,7 @@ release:.ovsbuild
        @rm -rf fuel-plugin-ovs
        sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
        sudo pip install fuel-plugin-builder
-       ./install_docker.sh
+       ../../docker/ubuntu-builder/install_docker.sh
        git clone $(OVS_NSH_DPDK_REPO)
        cd fuel-plugin-ovs; \
        git checkout $(OVS_NSH_DPDK_BRANCH); \

diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/install_docker.sh b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/install_docker.sh
deleted file mode 100755 (executable)
index 02acce2..0000000
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/install_docker.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# From prepare-build-env.sh of Fuel
-# Check if docker is installed
-if hash docker 2>/dev/null; then
-  echo "Docker binary found, checking if service is running..."
-  ps cax | grep docker > /dev/null
-  if [ $? -eq 0 ]; then
-    echo "Docker is running."
-  else
-    echo "Process is not running, starting it..."
-    sudo service docker start
-  fi
-else
-  # Install docker repository
-  # Check that HTTPS transport is available to APT
-  if [ ! -e /usr/lib/apt/methods/https ]; then
-    sudo apt-get update
-    sudo apt-get -y install -y apt-transport-https
-  fi
-  # Add the repository to APT sources
-  echo deb http://mirror.yandex.ru/mirrors/docker/ docker main | sudo tee /etc/apt/sources.list.d/docker.list
-  # Import the repository key
-  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
-fi

diff --git a/build/f_isoroot/f_qemupluginbuild/Makefile b/build/f_isoroot/f_qemupluginbuild/Makefile
index 19a2337..126e205 100644 (file)
--- a/build/f_isoroot/f_qemupluginbuild/Makefile
+++ b/build/f_isoroot/f_qemupluginbuild/Makefile
@@ -37,7 +37,7 @@ release:.qemubuild
        @rm -rf fuel-plugin-qemu
        sudo apt-get -y install build-essential ruby-dev rubygems-integration python-pip git rpm createrepo dpkg-dev
        sudo pip install fuel-plugin-builder
-       ./install_docker.sh
+       ../../docker/ubuntu-builder/install_docker.sh
        git clone $(QEMU_REPO)
        cd fuel-plugin-qemu; \
        git checkout $(QEMU_BRANCH); \