From 22dece0d969b476cf187fe7359fa38d96189cdc1 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Thu, 13 Feb 2014 16:21:24 -0500 Subject: [PATCH] Add Fedora support to install_docker.sh On Fedora, just install the docker-io package as supplied in the Fedora repository. Change-Id: Iea74878d3e1c434863c188ea2253817384e56bf4 --- tools/docker/install_docker.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/docker/install_docker.sh b/tools/docker/install_docker.sh index b9e1b242dd..27c8c8210b 100755 --- a/tools/docker/install_docker.sh +++ b/tools/docker/install_docker.sh @@ -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