From 986edf4a97d9c98cd784067275c426f03df52f77 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 27 Mar 2015 18:48:49 -0500
Subject: [PATCH] Replace ; with && in Dockerfile
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
---
docker/barbican/Dockerfile | 2 +-
docker/centos-rdo-base/Dockerfile | 6 +++---
docker/fedora-rdo-base/Dockerfile | 6 +++---
docker/glance/glance-base/Dockerfile | 2 +-
docker/hautoproxy/Dockerfile | 2 +-
docker/heat/heat-api/Dockerfile | 2 +-
docker/heat/heat-engine/Dockerfile | 2 +-
docker/keystone/Dockerfile | 2 +-
docker/mongodb/Dockerfile | 2 +-
docker/neutron/agents/l3/Dockerfile | 2 +-
docker/neutron/agents/linux-bridge/Dockerfile | 2 +-
docker/neutron/agents/metadata/Dockerfile | 2 +-
docker/neutron/neutron-base/Dockerfile | 2 +-
docker/neutron/neutron-server/Dockerfile | 2 +-
docker/nova-compute/nova-compute/Dockerfile | 2 +-
docker/nova-compute/nova-libvirt/Dockerfile | 3 ++-
docker/zaqar/Dockerfile | 2 +-
17 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/docker/barbican/Dockerfile b/docker/barbican/Dockerfile
index 3c7493bd21..f017f31744 100644
--- a/docker/barbican/Dockerfile
+++ b/docker/barbican/Dockerfile
@@ -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
diff --git a/docker/centos-rdo-base/Dockerfile b/docker/centos-rdo-base/Dockerfile
index 030d751c8b..d8c48afdc9 100644
--- a/docker/centos-rdo-base/Dockerfile
+++ b/docker/centos-rdo-base/Dockerfile
@@ -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
diff --git a/docker/fedora-rdo-base/Dockerfile b/docker/fedora-rdo-base/Dockerfile
index 19a4b72a16..a6f2400ff1 100644
--- a/docker/fedora-rdo-base/Dockerfile
+++ b/docker/fedora-rdo-base/Dockerfile
@@ -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
diff --git a/docker/glance/glance-base/Dockerfile b/docker/glance/glance-base/Dockerfile
index 2998cd19c9..74b5c0e239 100644
--- a/docker/glance/glance-base/Dockerfile
+++ b/docker/glance/glance-base/Dockerfile
@@ -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
diff --git a/docker/hautoproxy/Dockerfile b/docker/hautoproxy/Dockerfile
index d421ca488f..82b31eca3e 100644
--- a/docker/hautoproxy/Dockerfile
+++ b/docker/hautoproxy/Dockerfile
@@ -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
diff --git a/docker/heat/heat-api/Dockerfile b/docker/heat/heat-api/Dockerfile
index b89f76914d..76149b280b 100644
--- a/docker/heat/heat-api/Dockerfile
+++ b/docker/heat/heat-api/Dockerfile
@@ -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
diff --git a/docker/heat/heat-engine/Dockerfile b/docker/heat/heat-engine/Dockerfile
index f678f84e7c..544830d060 100644
--- a/docker/heat/heat-engine/Dockerfile
+++ b/docker/heat/heat-engine/Dockerfile
@@ -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"]
diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 7f1ade48fb..35e7315928 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -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
diff --git a/docker/mongodb/Dockerfile b/docker/mongodb/Dockerfile
index 357378f4e0..353df42b21 100644
--- a/docker/mongodb/Dockerfile
+++ b/docker/mongodb/Dockerfile
@@ -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
diff --git a/docker/neutron/agents/l3/Dockerfile b/docker/neutron/agents/l3/Dockerfile
index bf635371e0..261d4f40df 100644
--- a/docker/neutron/agents/l3/Dockerfile
+++ b/docker/neutron/agents/l3/Dockerfile
@@ -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
diff --git a/docker/neutron/agents/linux-bridge/Dockerfile b/docker/neutron/agents/linux-bridge/Dockerfile
index 7f2d113208..b53c30a4f5 100644
--- a/docker/neutron/agents/linux-bridge/Dockerfile
+++ b/docker/neutron/agents/linux-bridge/Dockerfile
@@ -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
diff --git a/docker/neutron/agents/metadata/Dockerfile b/docker/neutron/agents/metadata/Dockerfile
index bf635371e0..261d4f40df 100644
--- a/docker/neutron/agents/metadata/Dockerfile
+++ b/docker/neutron/agents/metadata/Dockerfile
@@ -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
diff --git a/docker/neutron/neutron-base/Dockerfile b/docker/neutron/neutron-base/Dockerfile
index 362e5c28dd..d4f89f3ae8 100644
--- a/docker/neutron/neutron-base/Dockerfile
+++ b/docker/neutron/neutron-base/Dockerfile
@@ -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
diff --git a/docker/neutron/neutron-server/Dockerfile b/docker/neutron/neutron-server/Dockerfile
index 852d3c44d2..9597f7c404 100644
--- a/docker/neutron/neutron-server/Dockerfile
+++ b/docker/neutron/neutron-server/Dockerfile
@@ -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
diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile
index bdc7ba3cde..079687c3a3 100644
--- a/docker/nova-compute/nova-compute/Dockerfile
+++ b/docker/nova-compute/nova-compute/Dockerfile
@@ -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
diff --git a/docker/nova-compute/nova-libvirt/Dockerfile b/docker/nova-compute/nova-libvirt/Dockerfile
index 36b8dfc019..7e75925fc4 100644
--- a/docker/nova-compute/nova-libvirt/Dockerfile
+++ b/docker/nova-compute/nova-libvirt/Dockerfile
@@ -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" ]
diff --git a/docker/zaqar/Dockerfile b/docker/zaqar/Dockerfile
index dc4c7c442d..e993887c46 100644
--- a/docker/zaqar/Dockerfile
+++ b/docker/zaqar/Dockerfile
@@ -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