Browse code

Removed docker version requirement

Change-Id: I9f04db46706bf6453def09ca1e22e0db918d811b
Closes-Bug: #1237581

Sam Alba authored on 2013/10/22 08:17:30
Showing 2 changed files
... ...
@@ -37,7 +37,6 @@ DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-http://get.docker.io/images/opens
37 37
 DOCKER_REGISTRY_IMAGE_NAME=docker-registry
38 38
 DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}
39 39
 
40
-DOCKER_PACKAGE_VERSION=${DOCKER_PACKAGE_VERSION:-0.6.1}
41 40
 DOCKER_APT_REPO=${DOCKER_APT_REPO:-https://get.docker.io/ubuntu}
42 41
 
43 42
 
... ...
@@ -72,7 +71,7 @@ function install_nova_hypervisor() {
72 72
     fi
73 73
 
74 74
     # Make sure Docker is installed
75
-    if ! is_package_installed lxc-docker-${DOCKER_PACKAGE_VERSION}; then
75
+    if ! is_package_installed lxc-docker; then
76 76
         die $LINENO "Docker is not installed.  Please run tools/docker/install_docker.sh"
77 77
     fi
78 78
 
... ...
@@ -38,7 +38,7 @@ curl https://get.docker.io/gpg | sudo apt-key add -
38 38
 install_package python-software-properties && \
39 39
     sudo sh -c "echo deb $DOCKER_APT_REPO docker main > /etc/apt/sources.list.d/docker.list"
40 40
 apt_get update
41
-install_package --force-yes lxc-docker-${DOCKER_PACKAGE_VERSION} socat
41
+install_package --force-yes lxc-docker socat
42 42
 
43 43
 # Start the daemon - restart just in case the package ever auto-starts...
44 44
 restart_service docker