From a0f67f67df6619f59e3f31d2bf3636a97bd80b51 Mon Sep 17 00:00:00 2001 From: Swapnil Kulkarni Date: Wed, 29 Jul 2015 03:23:51 +0000 Subject: [PATCH] Remove /opt/kolla directory creation base images No need to do a make dir since COPY will create it. Also removed from service specific base images since it will not be required. Change-Id: I15064eaf6e8faa9acbda68eaf3d85589ea9ed3d9 Closes-Bug: #1479176 --- docker/centos/binary/base/Dockerfile | 1 - docker/centos/binary/ceilometer/ceilometer-base/Dockerfile | 3 +-- docker/centos/binary/glance/glance-base/Dockerfile | 3 +-- docker/centos/binary/heat/heat-base/Dockerfile | 3 +-- docker/centos/binary/magnum/magnum-base/Dockerfile | 3 +-- docker/centos/source/base/Dockerfile | 1 - docker/centos/source/magnum/magnum-base/Dockerfile | 3 +-- docker/fedora/binary/base/Dockerfile | 4 +--- docker/ubuntu/source/base/Dockerfile | 1 - 9 files changed, 6 insertions(+), 16 deletions(-) diff --git a/docker/centos/binary/base/Dockerfile b/docker/centos/binary/base/Dockerfile index ebced1c82c..a06ff361e8 100644 --- a/docker/centos/binary/base/Dockerfile +++ b/docker/centos/binary/base/Dockerfile @@ -122,5 +122,4 @@ RUN rpm -e --nodeps pam RUN yum -y install pam+noaudit && yum clean all # End dirty like zebra -RUN mkdir -p /opt/kolla COPY service_hosts.sh kolla-common.sh /opt/kolla/ diff --git a/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile index 6aaf77ab2a..4ef1564de1 100644 --- a/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile +++ b/docker/centos/binary/ceilometer/ceilometer-base/Dockerfile @@ -1,5 +1,4 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -RUN mkdir -p /opt/kolla -COPY config-ceilometer.sh /opt/kolla/config-ceilometer.sh +COPY config-ceilometer.sh /opt/kolla/ diff --git a/docker/centos/binary/glance/glance-base/Dockerfile b/docker/centos/binary/glance/glance-base/Dockerfile index fd01442203..cf4276ae8c 100644 --- a/docker/centos/binary/glance/glance-base/Dockerfile +++ b/docker/centos/binary/glance/glance-base/Dockerfile @@ -3,5 +3,4 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN yum -y install openstack-glance python-oslo-i18n && yum clean all -RUN mkdir -p /opt/kolla -COPY config-glance.sh /opt/kolla/config-glance.sh +COPY config-glance.sh /opt/kolla/ diff --git a/docker/centos/binary/heat/heat-base/Dockerfile b/docker/centos/binary/heat/heat-base/Dockerfile index ebe9fa15c2..48710b3f35 100755 --- a/docker/centos/binary/heat/heat-base/Dockerfile +++ b/docker/centos/binary/heat/heat-base/Dockerfile @@ -1,5 +1,4 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% MAINTAINER Kolla Project (https://launchpad.net/kolla) -RUN mkdir -p /opt/kolla -COPY config-heat.sh /opt/kolla/config-heat.sh +COPY config-heat.sh /opt/kolla/ diff --git a/docker/centos/binary/magnum/magnum-base/Dockerfile b/docker/centos/binary/magnum/magnum-base/Dockerfile index c9c3db08b7..16a8a83c58 100644 --- a/docker/centos/binary/magnum/magnum-base/Dockerfile +++ b/docker/centos/binary/magnum/magnum-base/Dockerfile @@ -5,5 +5,4 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) RUN curl https://copr.fedoraproject.org/coprs/sdake/openstack-magnum/repo/epel-7/sdake-openstack-magnum-epel-7.repo -o /etc/yum.repos.d/sdake-openstack-magnum-epel-7.repo -RUN mkdir -p /opt/kolla -COPY config-magnum.sh /opt/kolla/config-magnum.sh +COPY config-magnum.sh /opt/kolla/ diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile index 2a9877b58b..cc5ed43f79 100644 --- a/docker/centos/source/base/Dockerfile +++ b/docker/centos/source/base/Dockerfile @@ -35,5 +35,4 @@ RUN pip install --upgrade \ pip \ tox -RUN mkdir -p /opt/kolla COPY service_hosts.sh kolla-common.sh /opt/kolla/ diff --git a/docker/centos/source/magnum/magnum-base/Dockerfile b/docker/centos/source/magnum/magnum-base/Dockerfile index f5d0fe55fa..6c44530430 100644 --- a/docker/centos/source/magnum/magnum-base/Dockerfile +++ b/docker/centos/source/magnum/magnum-base/Dockerfile @@ -12,5 +12,4 @@ RUN cd /magnum \ && cp -r /magnum/etc/* /etc/magnum/ \ && rm -rf /root/.cache -RUN mkdir -p /opt/kolla -COPY config-magnum.sh /opt/kolla/config-magnum.sh +COPY config-magnum.sh /opt/kolla/ diff --git a/docker/fedora/binary/base/Dockerfile b/docker/fedora/binary/base/Dockerfile index 285e128e90..21e998e116 100644 --- a/docker/fedora/binary/base/Dockerfile +++ b/docker/fedora/binary/base/Dockerfile @@ -104,6 +104,4 @@ RUN rpm -e --nodeps pam RUN yum -y install pam+noaudit && yum clean all # End dirty like zebra -RUN mkdir -p /opt/kolla -ADD service_hosts.sh /opt/kolla/service_hosts.sh -ADD kolla-common.sh /opt/kolla/kolla-common.sh +COPY service_hosts.sh kolla-common.sh /opt/kolla/ diff --git a/docker/ubuntu/source/base/Dockerfile b/docker/ubuntu/source/base/Dockerfile index 423d87473f..c0049b53dc 100644 --- a/docker/ubuntu/source/base/Dockerfile +++ b/docker/ubuntu/source/base/Dockerfile @@ -36,5 +36,4 @@ RUN pip install --upgrade \ pip \ tox -RUN mkdir /opt/kolla COPY service_hosts.sh kolla-common.sh /opt/kolla/