openstack/devstack
Code Issues Proposed changes

Add Fedora support to install_docker.sh

Browse Source 
On Fedora, just install the docker-io package as supplied in the
Fedora repository.

Change-Id: Iea74878d3e1c434863c188ea2253817384e56bf4
This commit is contained in:
John Eckersberg 2014-02-13 16:21:24 -05:00
parent 305bad7887
commit 22dece0d96
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/docker/install_docker.sh
View File

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