openstack/kolla-ansible
Code Issues Proposed changes

Change docker ADD file instruction to COPY

Browse Source 
Change-Id: I51c042d5947a5f0b30eb8c680ac3a1d97ccc3459
Closes-Bug: #1475155
This commit is contained in:
Swapnil Kulkarni 2015-07-16 06:32:35 +00:00
parent a973075ab4
commit 5c8561b1d7
33 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/centos/binary/barbican/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
# Install required packages # Install required packages
# NOTE: these packages (tar especially) can be pruned once converted to # NOTE: these packages (tar especially) can be pruned once converted to

2
docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-alarm && yum clean all RUN yum install -y openstack-ceilometer-alarm && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

2
docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
View File

@ -3,6 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-api && yum clean all RUN yum install -y openstack-ceilometer-api && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

2
docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-central && yum clean all RUN yum install -y openstack-ceilometer-central && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

2
docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-collector && yum clean all RUN yum install -y openstack-ceilometer-collector && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

2
docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
View File

@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \ RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-pecan \
&& yum clean all && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

2
docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-ceilometer-notification && yum clean all RUN yum install -y openstack-ceilometer-notification && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

2
docker/centos/binary/cinder-app/cinder-scheduler/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%cinder-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
CMD ["/start.sh"] CMD ["/start.sh"]

2
docker/centos/binary/docker-compose/README.md
View File

@ -8,7 +8,7 @@ Fast, isolated development environments using Docker.
Define your app's environment with Docker so it can be reproduced anywhere: Define your app's environment with Docker so it can be reproduced anywhere:
FROM python:2.7 FROM python:2.7
ADD . /code COPY . /code
WORKDIR /code WORKDIR /code
RUN pip install -r requirements.txt RUN pip install -r requirements.txt
CMD python app.py CMD python app.py

4
docker/centos/binary/glance/glance-api/Dockerfile
View File

@ -1,8 +1,8 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
ADD ./check.sh /check.sh COPY ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/glance/glance-registry/Dockerfile
View File

@ -3,5 +3,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
CMD ["/start.sh"] CMD ["/start.sh"]

4
docker/centos/binary/hautoproxy/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install haproxy python-jinja2 && yum clean all RUN yum -y install haproxy python-jinja2 && yum clean all
RUN mkdir -p /etc/haproxy/templates RUN mkdir -p /etc/haproxy/templates
ADD haproxy.cfg.tmpl /etc/haproxy/templates/haproxy.cfg.tmpl COPY haproxy.cfg.tmpl /etc/haproxy/templates/haproxy.cfg.tmpl
ADD start.py /start.py COPY start.py /start.py
CMD ["/start.py"] CMD ["/start.py"]

4
docker/centos/binary/heat/heat-api-cfn/Dockerfile
View File

@ -6,8 +6,8 @@ RUN yum -y install \
python-openstackclient \ python-openstackclient \
&& yum clean all && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
ADD ./check.sh /check.sh COPY ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

4
docker/centos/binary/heat/heat-api/Dockerfile
View File

@ -8,8 +8,8 @@ RUN yum -y install \
python-openstackclient \ python-openstackclient \
&& yum clean all && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
ADD ./check.sh /check.sh COPY ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/heat/heat-engine/Dockerfile
View File

@ -9,7 +9,7 @@ RUN yum -y install \
openstack-heat-engine \ openstack-heat-engine \
&& yum clean all && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/horizon/Dockerfile
View File

@ -17,6 +17,6 @@ COPY config-internal.sh config-external.sh horizon-bug-1469284.patch /opt/kolla/
# https://bugs.launchpad.net/kolla/+bug/1469284 becomes available upstream. # https://bugs.launchpad.net/kolla/+bug/1469284 becomes available upstream.
# Review for this bug is at https://review.openstack.org/#/c/167981/ # Review for this bug is at https://review.openstack.org/#/c/167981/
RUN patch /usr/lib/python2.7/site-packages/openstack_auth/user.py < /opt/kolla/horizon-bug-1469284.patch RUN patch /usr/lib/python2.7/site-packages/openstack_auth/user.py < /opt/kolla/horizon-bug-1469284.patch
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
CMD ["/start.sh"] CMD ["/start.sh"]

4
docker/centos/binary/magnum/magnum-api/Dockerfile
View File

@ -5,8 +5,8 @@ RUN yum -y install \
openstack-magnum-api \ openstack-magnum-api \
&& yum clean all && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
ADD ./check.sh /check.sh COPY ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/magnum/magnum-conductor/Dockerfile
View File

@ -9,7 +9,7 @@ RUN yum -y install \
# Install kubectl binary (ugh) # Install kubectl binary (ugh)
RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes RUN cd /tmp && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl && rm -rf /tmp/kubernetes
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

4
docker/centos/binary/mariadb-app/Dockerfile
View File

@ -10,8 +10,8 @@ RUN yum -y install mariadb \
&& yum clean all && yum clean all
# Add mysql configuration scripts # Add mysql configuration scripts
ADD config-mysql.sh /opt/kolla/config-mysql.sh COPY config-mysql.sh /opt/kolla/config-mysql.sh
ADD mysql-entrypoint.sh /opt/kolla/mysql-entrypoint.sh COPY mysql-entrypoint.sh /opt/kolla/mysql-entrypoint.sh
# start mysql # start mysql
ENTRYPOINT ["/opt/kolla/mysql-entrypoint.sh"] ENTRYPOINT ["/opt/kolla/mysql-entrypoint.sh"]

2
docker/centos/binary/nova-base/Dockerfile
View File

@ -7,5 +7,5 @@ RUN yum -y install openstack-nova-common \
python-nova \ python-nova \
bridge-utils && yum clean all bridge-utils && yum clean all
ADD config-nova.sh /opt/kolla/config-nova.sh COPY config-nova.sh /opt/kolla/config-nova.sh

4
docker/centos/binary/nova-compute/nova-compute/Dockerfile
View File

@ -4,9 +4,9 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-compute \ RUN yum -y install openstack-nova-compute \
sysfsutils && yum clean all sysfsutils && yum clean all
ADD config-nova-compute.sh /opt/kolla/config-nova-compute.sh COPY config-nova-compute.sh /opt/kolla/config-nova-compute.sh
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/nova-compute/nova-libvirt/Dockerfile
View File

@ -11,7 +11,7 @@ RUN yum -y install libvirt-daemon \
VOLUME [ "/sys/fs/cgroup" ] VOLUME [ "/sys/fs/cgroup" ]
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

4
docker/centos/binary/nova-compute/nova-network/Dockerfile
View File

@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-network \ RUN yum -y install openstack-nova-network \
bridge-utils initscripts && yum clean all bridge-utils initscripts && yum clean all
ADD config-nova-network.sh /opt/kolla/config-nova-network.sh COPY config-nova-network.sh /opt/kolla/config-nova-network.sh
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

4
docker/centos/binary/nova-controller/nova-api/Dockerfile
View File

@ -4,8 +4,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \
openstack-nova-api && yum clean all openstack-nova-api && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
ADD ./check.sh /check.sh COPY ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/nova-controller/nova-conductor/Dockerfile
View File

@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \
openstack-nova-conductor && yum clean all openstack-nova-conductor && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/nova-controller/nova-consoleauth/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-nova-console && yum clean all RUN yum -y install openstack-nova-console && yum clean all
ADD start.sh /start.sh COPY start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/nova-controller/nova-novncproxy/Dockerfile
View File

@ -5,7 +5,7 @@ RUN yum -y install \
novnc openstack-nova-novncproxy && \ novnc openstack-nova-novncproxy && \
yum clean all yum clean all
ADD start.sh /start.sh COPY start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/nova-controller/nova-scheduler/Dockerfile
View File

@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \ RUN yum -y install \
openstack-nova-scheduler && yum clean all openstack-nova-scheduler && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/swift/swift-account/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/swift/swift-container/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/swift/swift-object/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

2
docker/centos/binary/swift/swift-proxy-server/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%% FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla) MAINTAINER Kolla Project (https://launchpad.net/kolla)
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/

4
docker/centos/binary/zaqar/Dockerfile
View File

@ -3,8 +3,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-zaqar && yum clean all RUN yum -y install openstack-zaqar && yum clean all
ADD ./start.sh /start.sh COPY ./start.sh /start.sh
ADD ./check.sh /check.sh COPY ./check.sh /check.sh
COPY config-internal.sh config-external.sh /opt/kolla/ COPY config-internal.sh config-external.sh /opt/kolla/