Browse code

Merge "Removed docker version requirement"

Jenkins authored on 2013/10/31 23:22:37
Showing 2 changed files
... ...
@@ -38,7 +38,6 @@ DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-http://get.docker.io/images/opens
38 38
 DOCKER_REGISTRY_IMAGE_NAME=docker-registry
39 39
 DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}
40 40
 
41
-DOCKER_PACKAGE_VERSION=${DOCKER_PACKAGE_VERSION:-0.6.1}
42 41
 DOCKER_APT_REPO=${DOCKER_APT_REPO:-https://get.docker.io/ubuntu}
43 42
 
44 43
 
... ...
@@ -69,7 +68,7 @@ function install_nova_hypervisor() {
69 69
     fi
70 70
 
71 71
     # Make sure Docker is installed
72
-    if ! is_package_installed lxc-docker-${DOCKER_PACKAGE_VERSION}; then
72
+    if ! is_package_installed lxc-docker; then
73 73
         die $LINENO "Docker is not installed.  Please run tools/docker/install_docker.sh"
74 74
     fi
75 75
 
... ...
@@ -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