From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Wed, 9 Sep 2015 22:50:13 +0000 (-0700)
Subject: Update docker build for EL7
X-Git-Tag: release/beryllium~553^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=95692111a915104d21b8c2b536c0d6c46d43b173;p=releng%2Fbuilder.git

Update docker build for EL7

Reconfigure the docker build to support either Fedora or EL7 flavors for
creating docker images.

Change-Id: Ic0d7e8b1444c8fd0984e7a88b7be19d5685a711e
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
---

diff --git a/vagrant/docker/bootstrap.sh b/vagrant/docker/bootstrap.sh
index 3ba1164fc..676fd3d06 100644
--- a/vagrant/docker/bootstrap.sh
+++ b/vagrant/docker/bootstrap.sh
@@ -2,15 +2,15 @@
 
 # vim: sw=4 ts=4 sts=4 et :
 
-fedora_changes() {
+rh_changes() {
     # make sure we're fully updated
     echo "---> Updating OS"
-    dnf clean all
-    dnf update -y -q
+    yum clean all
+    yum update -y -q
 
     # install docker and enable it
     echo "---> Installing docker"
-    dnf install -y docker supervisor bridge-utils
+    yum install -y docker supervisor bridge-utils
     systemctl enable docker
 
     # configure docker networking so that it does not conflict with LF
@@ -24,13 +24,6 @@ EOL
     groupadd docker
 }
 
-el_changes() {
-    # make sure we're fully updated
-    echo "---> Updating OS"
-    yum clean all
-    yum update -q -y
-}
-
 ubuntu_changes() {
     # make sure we're fully updated
     echo "---> Updating OS"
@@ -40,11 +33,8 @@ ubuntu_changes() {
 
 OS=`/usr/bin/facter operatingsystem`
 case "$OS" in
-    Fedora)
-        fedora_changes
-    ;;
-    Centos|RedHat)
-        el_changes
+    CentOS|Fedora|RedHat)
+        rh_changes
     ;;
     Ubuntu)
         ubuntu_changes