Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update docker build for EL7
[releng/builder.git]
/
vagrant
/
docker
/
bootstrap.sh
diff --git
a/vagrant/docker/bootstrap.sh
b/vagrant/docker/bootstrap.sh
index 3ba1164fc54b6a75cc57b38477eafb56a12ab38f..676fd3d06626ce82e7f1bbec0ae689419c77d0e9 100644
(file)
--- a/
vagrant/docker/bootstrap.sh
+++ b/
vagrant/docker/bootstrap.sh
@@
-2,15
+2,15
@@
# vim: sw=4 ts=4 sts=4 et :
# vim: sw=4 ts=4 sts=4 et :
-
fedora
_changes() {
+
rh
_changes() {
# 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
@@
-24,13
+24,6
@@
EOL
groupadd docker
}
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"
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
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