summaryrefslogtreecommitdiffstats
path: root/gluster-s3object/CentOS
diff options
context:
space:
mode:
authorHumble Devassy Chirammal <humble.devassy@gmail.com>2018-03-01 12:45:35 +0530
committerGitHub <noreply@github.com>2018-03-01 12:45:35 +0530
commitab3a58dc5a2b365e9a01ee79e06d05ab0149cd20 (patch)
treeda24521fd402e73d7c00dff78f9e99dc876255f7 /gluster-s3object/CentOS
parent697965ec5f1a51eaf11c2c4ac7f8e3e7e36d0e5b (diff)
parentd7e7fb48f5f50c8fedc7228a3f4c13f324064274 (diff)
downloadgluster-ab3a58dc5a2b365e9a01ee79e06d05ab0149cd20.tar.gz
gluster-ab3a58dc5a2b365e9a01ee79e06d05ab0149cd20.tar.bz2
gluster-ab3a58dc5a2b365e9a01ee79e06d05ab0149cd20.tar.xz
gluster-ab3a58dc5a2b365e9a01ee79e06d05ab0149cd20.zip
Merge pull request #69 from raghavendra-talur/RUN-should-consider-exit-status-of-all-commands
fix bug when multiple shell commands are specified in RUN
Diffstat (limited to 'gluster-s3object/CentOS')
-rw-r--r--gluster-s3object/CentOS/docker-gluster-s3/Dockerfile28
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"]