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>
# vim: sw=4 ts=4 sts=4 et :
# vim: sw=4 ts=4 sts=4 et :
# make sure we're fully updated
echo "---> Updating OS"
# 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"
# 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
systemctl enable docker
# configure docker networking so that it does not conflict with LF
-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"
ubuntu_changes() {
# make sure we're fully updated
echo "---> Updating OS"
OS=`/usr/bin/facter operatingsystem`
case "$OS" in
OS=`/usr/bin/facter operatingsystem`
case "$OS" in
- Fedora)
- fedora_changes
- ;;
- Centos|RedHat)
- el_changes
+ CentOS|Fedora|RedHat)
+ rh_changes
;;
Ubuntu)
ubuntu_changes
;;
Ubuntu)
ubuntu_changes