diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-09 17:19:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-09 17:19:12 +0000 |
| commit | 8e5d76e60a1c6e59d13f0510a454977cb807efaf (patch) | |
| tree | 990d0e680d580e9ce048bf9c0fd2ad6f0d253166 /docker/centos/source | |
| parent | 271486d4dab285077b5f4f904b5cb67c44bd392f (diff) | |
| parent | b471aa42d282d502617ed9e215d238e32013e85b (diff) | |
| download | kolla-8e5d76e60a1c6e59d13f0510a454977cb807efaf.tar.gz kolla-8e5d76e60a1c6e59d13f0510a454977cb807efaf.zip | |
Merge "Remove config-internal from glance"
Diffstat (limited to 'docker/centos/source')
5 files changed, 2 insertions, 5 deletions
diff --git a/docker/centos/source/glance/glance-api/Dockerfile b/docker/centos/source/glance/glance-api/Dockerfile index 8b870b0ae..727feb0b7 100644 --- a/docker/centos/source/glance/glance-api/Dockerfile +++ b/docker/centos/source/glance/glance-api/Dockerfile @@ -3,6 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) COPY start.sh check.sh / -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-api/config-internal.sh b/docker/centos/source/glance/glance-api/config-internal.sh deleted file mode 120000 index 112e6557c..000000000 --- a/docker/centos/source/glance/glance-api/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-api/config-internal.sh
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-base/config-glance.sh b/docker/centos/source/glance/glance-base/config-glance.sh deleted file mode 120000 index d5c26f0b8..000000000 --- a/docker/centos/source/glance/glance-base/config-glance.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-base/config-glance.sh
\ No newline at end of file diff --git a/docker/centos/source/glance/glance-registry/Dockerfile b/docker/centos/source/glance/glance-registry/Dockerfile index 03eb22f4a..22e3fcb10 100644 --- a/docker/centos/source/glance/glance-registry/Dockerfile +++ b/docker/centos/source/glance/glance-registry/Dockerfile @@ -1,7 +1,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -COPY config-internal.sh config-external.sh /opt/kolla/ +COPY config-external.sh /opt/kolla/ COPY start.sh / CMD ["/start.sh"] diff --git a/docker/centos/source/glance/glance-registry/config-internal.sh b/docker/centos/source/glance/glance-registry/config-internal.sh deleted file mode 120000 index c3d48cfc0..000000000 --- a/docker/centos/source/glance/glance-registry/config-internal.sh +++ /dev/null @@ -1 +0,0 @@ -../../../../common/glance/glance-registry/config-internal.sh
\ No newline at end of file |