openstack/kolla-ansible
Code Issues Proposed changes

Replace ; with && in Dockerfile

Browse Source 
When using ';' this can allow the previous command to fail and while the
docker build proceeds without realizing a command failed. Switching to
'&&' allows the exit code to make it to the docker build command and the
build to fail appropriately.

Change-Id: Idd0991ed4549542bb10d27da1a0a025d0503b6c1
This commit is contained in:
Sam Yaple 2015-03-27 18:48:49 -05:00
parent afcc1569b8
commit 986edf4a97
17 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/barbican/Dockerfile
View File

@ -21,7 +21,7 @@ RUN pip install -r barbican-$PBR_VERSION/requirements.txt
RUN pip install MySQL-python
# Install Barbican
RUN cd barbican-$PBR_VERSION ; python setup.py install
RUN cd barbican-$PBR_VERSION && python setup.py install
# Configure Barbican
RUN mkdir -p /etc/barbican

6
docker/centos-rdo-base/Dockerfile
View File

@ -5,10 +5,10 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
RUN curl https://copr.fedoraproject.org/coprs/larsks/crux/repo/epel-7/larsks-crux-epel-7.repo -o /etc/yum.repos.d/larsks-crux-epel-7.repo
RUN yum install -y epel-release; yum clean all
RUN yum install -y epel-release && yum clean all
# Update packages
RUN yum update -y; yum clean all
RUN yum update -y && yum clean all
# Install base packages
RUN yum install -y \
@ -90,7 +90,7 @@ RUN yum install -y \
python-webtest \
python-werkzeug \
python-wsme \
; yum clean all
&& yum clean all
# This is dirty like zebra. This works aorund a bug in Ubuntu 14.04 LTS. The
# --net=host option does not work on ubuntu 14.04 because of a kernel bug. One

6
docker/fedora-rdo-base/Dockerfile
View File

@ -3,11 +3,11 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Set up repositories
RUN yum install -y https://rdo.fedorapeople.org/rdo-release.rpm
RUN yum -y install dnf dnf-plugins-core; yum clean all
RUN yum -y install dnf dnf-plugins-core && yum clean all
RUN dnf copr enable -y larsks/crux
# Update packages
RUN yum update -y; yum clean all
RUN yum update -y && yum clean all
# Install base packages
RUN yum install -y \
@ -89,7 +89,7 @@ RUN yum install -y \
python-webtest \
python-werkzeug \
python-wsme \
; yum clean all
&& yum clean all
RUN mkdir -p /opt/kolla
ADD service_hosts.sh /opt/kolla/service_hosts.sh

2
docker/glance/glance-base/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-glance ; yum clean all
RUN yum -y install openstack-glance && yum clean all
RUN mkdir -p /opt/kolla
COPY config-glance.sh /opt/kolla/config-glance.sh

2
docker/hautoproxy/Dockerfile
View File

@ -1,7 +1,7 @@
FROM fedora:20
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
ADD haproxy.cfg.tmpl /etc/haproxy/templates/haproxy.cfg.tmpl
ADD start.py /start.py

2
docker/heat/heat-api/Dockerfile
View File

@ -6,7 +6,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
openstack-heat-api \
python-openstackclient \
; yum clean all
&& yum clean all
ADD ./start.sh /start.sh
ADD ./check.sh /check.sh

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

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install \
openstack-heat-engine \
; yum clean all
&& yum clean all
ADD ./start.sh /start.sh
CMD ["/start.sh"]

2
docker/keystone/Dockerfile
View File

@ -4,7 +4,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
#Install required packages
RUN yum -y install openstack-keystone \
python-keystoneclient \
; yum clean all
&& yum clean all
# Add start-up and check scripts
ADD ./start.sh /start.sh

2
docker/mongodb/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install mongodb mongodb-server; yum clean all
RUN yum -y install mongodb mongodb-server && yum clean all
RUN mkdir -p /data/db

2
docker/neutron/agents/l3/Dockerfile
View File

@ -2,7 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages
RUN yum install -y openstack-neutron && yum clean all;
RUN yum install -y openstack-neutron && yum clean all
# Add required scripts
ADD ./start.sh /start.sh

2
docker/neutron/agents/linux-bridge/Dockerfile
View File

@ -3,7 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages
RUN yum install -y openstack-neutron \
openstack-neutron-linuxbridge && yum clean all;
openstack-neutron-linuxbridge && yum clean all
# Add required scripts
ADD ./start.sh /start.sh

2
docker/neutron/agents/metadata/Dockerfile
View File

@ -2,7 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%neutron-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# Install required packages
RUN yum install -y openstack-neutron && yum clean all;
RUN yum install -y openstack-neutron && yum clean all
# Add required scripts
ADD ./start.sh /start.sh

2
docker/neutron/neutron-base/Dockerfile
View File

@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install openstack-neutron-ml2 ; yum clean all
RUN yum -y install openstack-neutron-ml2 && yum clean all
RUN mkdir -p /opt/kolla
COPY config-neutron.sh /opt/kolla/config-neutron.sh

2
docker/neutron/neutron-server/Dockerfile
View File

@ -5,7 +5,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum install -y openstack-neutron \
python-neutronclient \
mariadb \
; yum clean all
&& yum clean all
VOLUME /var/lib/neutron

2
docker/nova-compute/nova-compute/Dockerfile
View File

@ -2,7 +2,7 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%nova-base
MAINTAINER Kolla Project (https://launchpad.net/kolla)
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

3
docker/nova-compute/nova-libvirt/Dockerfile
View File

@ -3,7 +3,8 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
RUN yum -y install libvirtd libguestfs qemu-system-x86 \
libvirt-daemon-driver-nwfilter \
libvirt-daemon-config-nwfilter; yum clean all
libvirt-daemon-config-nwfilter \
&& yum clean all
VOLUME [ "/sys/fs/cgroup" ]

2
docker/zaqar/Dockerfile
View File

@ -7,7 +7,7 @@ RUN curl -O https://repos.fedorapeople.org/repos/openstack/openstack-juno/fedora
RUN yum -y localinstall python-oslo-utils-0.3.0-1.fc22.noarch.rpm \
python-keystonemiddleware-1.2.0-1.fc22.noarch.rpm \
openstack-zaqar-2014.2-1.fc22.noarch.rpm \
; yum clean all
&& yum clean all
EXPOSE 8888