openstack/devstack
Code Issues Proposed changes

Merge "Add Fedora support to install_docker.sh"

Browse Source
This commit is contained in:
Jenkins
2014-02-15 01:44:54 +00:00
committed by Gerrit Code Review
parent 44f51c3faa 22dece0d96
commit b4596480b2
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/docker/install_docker.sh
View File

@@ -30,15 +30,19 @@ SERVICE_TIMEOUT=${SERVICE_TIMEOUT:-60}
# Install Docker Service
# ======================
# Stop the auto-repo updates and do it when required here
NO_UPDATE_REPOS=True
if is_fedora; then
install_package docker-io socat
else
# Stop the auto-repo updates and do it when required here
NO_UPDATE_REPOS=True
# Set up home repo
curl https://get.docker.io/gpg | sudo apt-key add -
install_package python-software-properties && \
sudo sh -c "echo deb $DOCKER_APT_REPO docker main > /etc/apt/sources.list.d/docker.list"
apt_get update
install_package --force-yes lxc-docker socat
# Set up home repo
curl https://get.docker.io/gpg | sudo apt-key add -
install_package python-software-properties && \
sudo sh -c "echo deb $DOCKER_APT_REPO docker main > /etc/apt/sources.list.d/docker.list"
apt_get update
install_package --force-yes lxc-docker socat
fi
# Start the daemon - restart just in case the package ever auto-starts...
restart_service docker