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
Add infrautils jenkins jobs
[releng/builder.git]
/
vagrant
/
docker
/
bootstrap.sh
diff --git
a/vagrant/docker/bootstrap.sh
b/vagrant/docker/bootstrap.sh
index 676fd3d06626ce82e7f1bbec0ae689419c77d0e9..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
@@
-19,19
+15,19
@@
rh_changes() {
# /etc/sysconfig/docker-network
DOCKER_NETWORK_OPTIONS='--bip=10.250.0.254/24'
EOL
# /etc/sysconfig/docker-network
DOCKER_NETWORK_OPTIONS='--bip=10.250.0.254/24'
EOL
+ # configure docker daemon to listen on port 5555 enabling remote
+ # managment
+ sed -i -e "s#='--selinux-enabled'#='--selinux-enabled -H unix:///var/run/docker.sock -H tcp://0.0.0.0:5555'#g" /etc/sysconfig/docker
# docker group doesn't get created by default for some reason
groupadd docker
}
ubuntu_changes() {
# docker group doesn't get created by default for some reason
groupadd docker
}
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