diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-06-25 04:26:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-06-25 04:26:26 +0000 |
| commit | e8535fc361ab3bc925146c8b2be8e732935040cf (patch) | |
| tree | acf6b56f7b861fd43eed4638afc7bb7f35918a07 | |
| parent | 061084f71f478148a5c662d87312bf96f18e0f88 (diff) | |
| parent | 61a0bb6ce497c0835e1f0f79faa2d5e97c35e0fe (diff) | |
| download | kolla-e8535fc361ab3bc925146c8b2be8e732935040cf.tar.gz kolla-e8535fc361ab3bc925146c8b2be8e732935040cf.zip | |
Merge "Move glance-data container to the correct place"
| -rw-r--r-- | docker/centos/binary/glance/glance-data/Dockerfile (renamed from docker/glance/glance-data/Dockerfile) | 0 | ||||
| l--------- | docker/centos/binary/glance/glance-data/build | 1 | ||||
| l--------- | docker/glance/glance-data/build | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/docker/glance/glance-data/Dockerfile b/docker/centos/binary/glance/glance-data/Dockerfile index e99c60eca..e99c60eca 100644 --- a/docker/glance/glance-data/Dockerfile +++ b/docker/centos/binary/glance/glance-data/Dockerfile diff --git a/docker/centos/binary/glance/glance-data/build b/docker/centos/binary/glance/glance-data/build new file mode 120000 index 000000000..ec1913803 --- /dev/null +++ b/docker/centos/binary/glance/glance-data/build @@ -0,0 +1 @@ +../../../../../tools/build-docker-image
\ No newline at end of file diff --git a/docker/glance/glance-data/build b/docker/glance/glance-data/build deleted file mode 120000 index 43944faa0..000000000 --- a/docker/glance/glance-data/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image
\ No newline at end of file |