Browse code
Fix bugs for installing docker, bug #1237581. -The change in install_docker.sh corrects a typo ('=' should be '-'). This typo resutls in 'unable to locate the packet' error when executing apt-get.
-The second change is in hypervisor-docker fix the error for reporting
docker is not installed when docker is actually set up. The original line
missed the version part of the package name.
Change-Id: Ic48f45158cf84f89080f095d53c355e9f6969bfd
Min Li authored on 2013/10/10 04:45:41Showing 2 changed files
| ... | ... |
@@ -72,7 +72,7 @@ function install_nova_hypervisor() {
|
| 72 | 72 |
fi |
| 73 | 73 |
|
| 74 | 74 |
# Make sure Docker is installed |
| 75 |
- if ! is_package_installed lxc-docker; then |
|
| 75 |
+ if ! is_package_installed lxc-docker-${DOCKER_PACKAGE_VERSION}; 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-${DOCKER_PACKAGE_VERSION} socat
|
|
| 42 | 42 |
|
| 43 | 43 |
# Start the daemon - restart just in case the package ever auto-starts... |
| 44 | 44 |
restart_service docker |