From a0f67f67df6619f59e3f31d2bf3636a97bd80b51 Mon Sep 17 00:00:00 2001 From: Swapnil Kulkarni Date: Wed, 29 Jul 2015 03:23:51 +0000 Subject: 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/source/base/Dockerfile | 1 - docker/centos/source/magnum/magnum-base/Dockerfile | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'docker/centos/source') diff --git a/docker/centos/source/base/Dockerfile b/docker/centos/source/base/Dockerfile index 2a9877b58..cc5ed43f7 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 f5d0fe55f..6c4453043 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/ -- cgit v1.2.3