Browse code
Pull docker images from global registry
The global docker registry is where images are
being built and uploaded. It's effectively docker's
version of, say, 'pip'. The static tarballs are
not only an extra maintenance burden as they're outside
the standard build and publishing process, but are presently
outside the scope of an open development / release
process as well.
While this process does cause some trouble with
network-independence for CI purposes, the fetching
is still done from install-docker.sh; Additionally,
this driver is not currently tested via the community CI effort.
Change-Id: I3ee6bfee9c273cd3aabe1e00a1d1a8856a466189
Eric Windisch authored on 2014/01/31 15:25:28Showing 2 changed files
| ... | ... |
@@ -31,10 +31,10 @@ DOCKER_UNIX_SOCKET=/var/run/docker.sock |
| 31 | 31 |
DOCKER_PID_FILE=/var/run/docker.pid |
| 32 | 32 |
DOCKER_REGISTRY_PORT=${DOCKER_REGISTRY_PORT:-5042}
|
| 33 | 33 |
|
| 34 |
-DOCKER_IMAGE=${DOCKER_IMAGE:-http://get.docker.io/images/openstack/docker-ut.tar.gz}
|
|
| 35 |
-DOCKER_IMAGE_NAME=docker-busybox |
|
| 36 |
-DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-http://get.docker.io/images/openstack/docker-registry.tar.gz}
|
|
| 37 |
-DOCKER_REGISTRY_IMAGE_NAME=docker-registry |
|
| 34 |
+DOCKER_IMAGE=${DOCKER_IMAGE:-busybox:latest}
|
|
| 35 |
+DOCKER_IMAGE_NAME=busybox |
|
| 36 |
+DOCKER_REGISTRY_IMAGE=${DOCKER_REGISTRY_IMAGE:-registry:latest}
|
|
| 37 |
+DOCKER_REGISTRY_IMAGE_NAME=registry |
|
| 38 | 38 |
DOCKER_REPOSITORY_NAME=${SERVICE_HOST}:${DOCKER_REGISTRY_PORT}/${DOCKER_IMAGE_NAME}
|
| 39 | 39 |
|
| 40 | 40 |
DOCKER_APT_REPO=${DOCKER_APT_REPO:-https://get.docker.io/ubuntu}
|
| ... | ... |
@@ -55,21 +55,10 @@ if ! timeout $SERVICE_TIMEOUT sh -c "$CONFIGURE_CMD"; then |
| 55 | 55 |
die $LINENO "docker did not start" |
| 56 | 56 |
fi |
| 57 | 57 |
|
| 58 |
+# Get guest container image |
|
| 59 |
+docker pull $DOCKER_IMAGE |
|
| 60 |
+docker tag $DOCKER_IMAGE $DOCKER_IMAGE_NAME |
|
| 58 | 61 |
|
| 59 |
-# Get Docker image |
|
| 60 |
-if [[ ! -r $FILES/docker-ut.tar.gz ]]; then |
|
| 61 |
- (cd $FILES; curl -OR $DOCKER_IMAGE) |
|
| 62 |
-fi |
|
| 63 |
-if [[ ! -r $FILES/docker-ut.tar.gz ]]; then |
|
| 64 |
- die $LINENO "Docker image unavailable" |
|
| 65 |
-fi |
|
| 66 |
-docker import - $DOCKER_IMAGE_NAME <$FILES/docker-ut.tar.gz |
|
| 67 |
- |
|
| 68 |
-# Get Docker registry image |
|
| 69 |
-if [[ ! -r $FILES/docker-registry.tar.gz ]]; then |
|
| 70 |
- (cd $FILES; curl -OR $DOCKER_REGISTRY_IMAGE) |
|
| 71 |
-fi |
|
| 72 |
-if [[ ! -r $FILES/docker-registry.tar.gz ]]; then |
|
| 73 |
- die $LINENO "Docker registry image unavailable" |
|
| 74 |
-fi |
|
| 75 |
-docker import - $DOCKER_REGISTRY_IMAGE_NAME <$FILES/docker-registry.tar.gz |
|
| 62 |
+# Get docker-registry image |
|
| 63 |
+docker pull $REGISTRY_IMAGE |
|
| 64 |
+docker tag $REGISTRY_IMAGE $REGISTRY_IMAGE_NAME |