diff options
| author | Sam Yaple <sam@yaple.net> | 2015-03-27 18:48:49 -0500 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-03-27 18:52:48 -0500 |
| commit | 986edf4a97d9c98cd784067275c426f03df52f77 (patch) | |
| tree | 22793b9eebbac421986855dbdc290b849726a772 /docker/nova-compute | |
| parent | afcc1569b8fe3f962ad13bd0ed780c3336163fd3 (diff) | |
| download | kolla-986edf4a97d9c98cd784067275c426f03df52f77.tar.gz kolla-986edf4a97d9c98cd784067275c426f03df52f77.zip | |
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
Diffstat (limited to 'docker/nova-compute')
| -rw-r--r-- | docker/nova-compute/nova-compute/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/nova-compute/nova-libvirt/Dockerfile | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/nova-compute/nova-compute/Dockerfile b/docker/nova-compute/nova-compute/Dockerfile index bdc7ba3cd..079687c3a 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 36b8dfc01..7e75925fc 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" ] |