@@ -32,7 +32,7 @@ DOCKER_PID_FILE=/var/run/docker.pid

 DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042}

 DOCKER_IMAGE=${DOCKER_IMAGE:-cirros:latest}

-DOCKER_IMAGE_NAME=cirros

+DOCKER_IMAGE_NAME=$DEFAULT_IMAGE_NAME

 DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest}

 DOCKER_REGISTRY_IMAGE_NAME=registry

 DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}

@@ -284,6 +284,9 @@ case "$VIRT_DRIVER" in

     openvz)

         DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ubuntu-12.04-x86_64}

         IMAGE_URLS=${IMAGE_URLS:-"http://download.openvz.org/template/precreated/ubuntu-12.04-x86_64.tar.gz"};;

+    docker)

+        DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-cirros}

+        IMAGE_URLS=${IMAGE_URLS:-};;

     libvirt)

         case "$LIBVIRT_TYPE" in

             lxc) # the cirros root disk in the uec tarball is empty, so it will not work for lxc