diff options
| author | Raghavendra Talur <rtalur@redhat.com> | 2018-03-01 12:29:53 +0530 |
|---|---|---|
| committer | Raghavendra Talur <rtalur@redhat.com> | 2018-03-01 12:41:01 +0530 |
| commit | d7e7fb48f5f50c8fedc7228a3f4c13f324064274 (patch) | |
| tree | da24521fd402e73d7c00dff78f9e99dc876255f7 /gluster-s3object | |
| parent | 697965ec5f1a51eaf11c2c4ac7f8e3e7e36d0e5b (diff) | |
| download | gluster-d7e7fb48f5f50c8fedc7228a3f4c13f324064274.tar.gz gluster-d7e7fb48f5f50c8fedc7228a3f4c13f324064274.tar.bz2 gluster-d7e7fb48f5f50c8fedc7228a3f4c13f324064274.tar.xz gluster-d7e7fb48f5f50c8fedc7228a3f4c13f324064274.zip | |
fix bug when multiple shell commands are specified in RUN
If RUN is followed by two commands only the return value of second
determines whether RUN was successful or not. This may lead to cases
where docker build succeeds even when it should not.
For example
RUN /bin/false; /bin/true
would be considered a success.
Important thing to consider is that all yum/dnf commands should perform
clean in the same RUN operation if we wish to keep the container image
size small. Running clean in a second RUN operation leads to bigger
image size contrary to expectation because each operation leads to a
layer in the image.
With the above two points considered, I have replaced ";" with "&&"
where necessary and split a single RUN operation to two or many
operations in other places.
Signed-off-by: Raghavendra Talur <rtalur@redhat.com>
Diffstat (limited to 'gluster-s3object')
| -rw-r--r-- | gluster-s3object/CentOS/docker-gluster-s3/Dockerfile | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile index 9c857f4..e477912 100644 --- a/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile +++ b/gluster-s3object/CentOS/docker-gluster-s3/Dockerfile @@ -27,13 +27,13 @@ RUN yum -v --setopt=tsflags=nodocs -y update && \ openstack-swift openstack-swift-{proxy,account,container,object,plugin-swift3} \ git memcached python-prettytable python-setuptools && \ yum -y install systemd && \ - (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \ - rm -f /lib/systemd/system/multi-user.target.wants/*;\ - rm -f /etc/systemd/system/*.wants/*;\ - rm -f /lib/systemd/system/local-fs.target.wants/*; \ - rm -f /lib/systemd/system/sockets.target.wants/*udev*; \ - rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ - rm -f /lib/systemd/system/basic.target.wants/*;\ + (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done) && \ + rm -f /lib/systemd/system/multi-user.target.wants/* &&\ + rm -f /etc/systemd/system/*.wants/* &&\ + rm -f /lib/systemd/system/local-fs.target.wants/* && \ + rm -f /lib/systemd/system/sockets.target.wants/*udev* && \ + rm -f /lib/systemd/system/sockets.target.wants/*initctl* && \ + rm -f /lib/systemd/system/basic.target.wants/* &&\ rm -f /lib/systemd/system/anaconda.target.wants/* && \ yum -y clean all @@ -75,13 +75,13 @@ EXPOSE 8080 RUN echo 'root:password' | chpasswd VOLUME [ "/sys/fs/cgroup" ] -RUN systemctl enable swift-gen-builders.service;\ -systemctl enable memcached.service;\ -systemctl enable swift-proxy.service;\ -systemctl enable swift-account.service;\ -systemctl enable swift-container.service;\ -systemctl enable swift-object.service;\ -systemctl enable swift-adduser.service; +RUN systemctl enable swift-gen-builders.service &&\ +systemctl enable memcached.service &&\ +systemctl enable swift-proxy.service &&\ +systemctl enable swift-account.service &&\ +systemctl enable swift-container.service &&\ +systemctl enable swift-object.service &&\ +systemctl enable swift-adduser.service ENTRYPOINT ["/usr/local/bin/update_gluster_vol.sh"] CMD ["/usr/sbin/init"] |