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 vagrant definition for private cloud
[releng/builder.git]
/
vagrant
/
docker
/
bootstrap.sh
diff --git
a/vagrant/docker/bootstrap.sh
b/vagrant/docker/bootstrap.sh
index ebafa994f23555aaf444e2e3a29a32c4653514c7..23b1fc042c0a9e78e8c9bfd346afe8f5bd0df2b8 100644
(file)
--- a/
vagrant/docker/bootstrap.sh
+++ b/
vagrant/docker/bootstrap.sh
@@
-3,11
+3,7
@@
# vim: sw=4 ts=4 sts=4 et :
rh_changes() {
# vim: sw=4 ts=4 sts=4 et :
rh_changes() {
- # make sure we're fully updated
- echo "---> Updating OS"
- yum clean all
- yum update -y -q
-
+ echo "---> RH changes"
# install docker and enable it
echo "---> Installing docker"
yum install -y docker supervisor bridge-utils
# install docker and enable it
echo "---> Installing docker"
yum install -y docker supervisor bridge-utils
@@
-28,13
+24,10
@@
EOL
}
ubuntu_changes() {
}
ubuntu_changes() {
- # make sure we're fully updated
- echo "---> Updating OS"
- apt-get update
- apt-get upgrade -y -qq
+ echo "---> Ubuntu changes"
}
}
-OS=
`/usr/bin/facter operatingsystem`
+OS=
$(/usr/bin/facter operatingsystem)
case "$OS" in
CentOS|Fedora|RedHat)
rh_changes
case "$OS" in
CentOS|Fedora|RedHat)
rh_changes