diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-10 12:44:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-10 12:44:26 +0000 |
| commit | 88b6f97cd05dceb817978f6bb44d528cd39d31a9 (patch) | |
| tree | 5069fd30eb2dcff24b0318f4324b75e70c3c3f75 | |
| parent | 3877eeeeaf73920070945526345e03875a16f6b6 (diff) | |
| parent | b132587389adb7c8b32eda2bc4b353f9e91eaede (diff) | |
| download | kolla-88b6f97cd05dceb817978f6bb44d528cd39d31a9.tar.gz kolla-88b6f97cd05dceb817978f6bb44d528cd39d31a9.zip | |
Merge "Remove config-internal for glance"
| -rw-r--r-- | docker/centos/binary/glance/glance-base/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/centos/source/glance/glance-base/Dockerfile | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/centos/binary/glance/glance-base/Dockerfile b/docker/centos/binary/glance/glance-base/Dockerfile index cf4276ae8..38e63c761 100644 --- a/docker/centos/binary/glance/glance-base/Dockerfile +++ b/docker/centos/binary/glance/glance-base/Dockerfile @@ -2,5 +2,3 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-glance python-oslo-i18n && yum clean all - -COPY config-glance.sh /opt/kolla/ diff --git a/docker/centos/source/glance/glance-base/Dockerfile b/docker/centos/source/glance/glance-base/Dockerfile index 82490ae2d..a552a0d19 100644 --- a/docker/centos/source/glance/glance-base/Dockerfile +++ b/docker/centos/source/glance/glance-base/Dockerfile @@ -11,6 +11,4 @@ RUN cd /glance \ && cp -r /glance/etc/* /etc/glance/ \ && rm -rf /root/.cache -COPY config-glance.sh /opt/kolla/ - CMD ["/start.sh"] |