openstack/devstack
Code Issues Proposed changes

Merge "Pull docker images from global registry"

Browse Source
This commit is contained in:
Jenkins 2014-02-03 18:51:25 +00:00 committed by Gerrit Code Review
commit 792490b68b
2 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nova_plugins/hypervisor-docker
View File

@ -31,10 +31,10 @@ DOCKER_UNIX_SOCKET=/var/run/docker.sock
DOCKER_PID_FILE=/var/run/docker.pid DOCKER_PID_FILE=/var/run/docker.pid
DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042} DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042}
DOCKER_IMAGE=${DOCKER_IMAGE:-http://get.docker.io/images/openstack/docker-ut.tar.gz} DOCKER_IMAGE=${DOCKER_IMAGE:-busybox:latest}
DOCKER_IMAGE_NAME=docker-busybox DOCKER_IMAGE_NAME=busybox
DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-http://get.docker.io/images/openstack/docker-registry.tar.gz} DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest}
DOCKER_REGISTRY_IMAGE_NAME=docker-registry DOCKER_REGISTRY_IMAGE_NAME=registry
DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME} DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}
DOCKER_APT_REPO=${DOCKER_APT_REPO:-https://get.docker.io/ubuntu} DOCKER_APT_REPO=${DOCKER_APT_REPO:-https://get.docker.io/ubuntu}

23
tools/docker/install_docker.sh
View File

@ -55,21 +55,10 @@ if ! timeout $SERVICE_TIMEOUT sh -c "$CONFIGURE_CMD"; then
die $LINENO "docker did not start" die $LINENO "docker did not start"
fi fi
# Get guest container image
docker pull $DOCKER_IMAGE
docker tag $DOCKER_IMAGE $DOCKER_IMAGE_NAME
# Get Docker image # Get docker-registry image
if [[ ! -r $FILES/docker-ut.tar.gz ]]; then docker pull $REGISTRY_IMAGE
(cd $FILES; curl -OR $DOCKER_IMAGE) docker tag $REGISTRY_IMAGE $REGISTRY_IMAGE_NAME
fi
if [[ ! -r $FILES/docker-ut.tar.gz ]]; then
die $LINENO "Docker image unavailable"
fi
docker import - $DOCKER_IMAGE_NAME <$FILES/docker-ut.tar.gz
# Get Docker registry image
if [[ ! -r $FILES/docker-registry.tar.gz ]]; then
(cd $FILES; curl -OR $DOCKER_REGISTRY_IMAGE)
fi
if [[ ! -r $FILES/docker-registry.tar.gz ]]; then
die $LINENO "Docker registry image unavailable"
fi
docker import - $DOCKER_REGISTRY_IMAGE_NAME <$FILES/docker-registry.tar.gz