Include Gluster block support and few debugging toolsands

1 files changed, 12 insertions, 9 deletions

diff --git a/CentOS/Dockerfile b/CentOS/Dockerfile
index 89b171b..e1db9f9 100644
--- a/CentOS/Dockerfile
+++ b/CentOS/Dockerfile
@@ -6,15 +6,18 @@ ENV container docker
 
 LABEL architecture="x86_64" \
       name="gluster/gluster-centos" \
-      version="3.13" \
+      version="3.12" \
       vendor="CentOS Community" \
-      summary="This image has a running glusterfs service ( CentOS 7 + Gluster 3.13)" \
-      io.k8s.display-name="Gluster 3.13 based on CentOS 7" \
+      summary="This image has a running glusterfs service ( CentOS 7 + Gluster 3.12)" \
+      io.k8s.display-name="Gluster 3.12 based on CentOS 7" \
       io.k8s.description="Gluster Image is based on CentOS Image which is a scalable network filesystem. Using common off-the-shelf hardware, you can create large, distributed storage solutions for media streaming, data analysis, and other data- and bandwidth-intensive tasks." \
       description="Gluster Image is based on CentOS Image which is a scalable network filesystem. Using common off-the-shelf hardware, you can create large, distributed storage solutions for media streaming, data analysis, and other data- and bandwidth-intensive tasks." \
       io.openshift.tags="gluster,glusterfs,glusterfs-centos"
 
-RUN yum --setopt=tsflags=nodocs -y update && yum install -y centos-release-gluster313 && yum clean all && \
+RUN yum --setopt=tsflags=nodocs -y update && \
+    yum install -y centos-release-gluster312 && \
+    yum-config-manager --enable centos-gluster312\* && \
+    yum clean all && \
 (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/* &&\
@@ -23,11 +26,11 @@ 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 --setopt=tsflags=nodocs -y install nfs-utils attr iputils iproute openssh-server openssh-clients ntp rsync tar cronie sudo xfsprogs glusterfs glusterfs-server glusterfs-rdma glusterfs-geo-replication && yum clean all && \
+yum --setopt=tsflags=nodocs -y install nfs-utils attr iputils iproute rsync tar cronie sudo xfsprogs glusterfs glusterfs-server glusterfs-rdma glusterfs-geo-replication gluster-block mc lsof telnet iscsi-initiator-utils; yum clean all && \
 sed -i '/Defaults    requiretty/c\#Defaults    requiretty' /etc/sudoers && \
-sed -i '/Port 22/c\Port 2222' /etc/ssh/sshd_config && \
 sed -i 's/Requires\=rpcbind\.service//g' /usr/lib/systemd/system/glusterd.service && \
 sed -i 's/rpcbind\.service/gluster-setup\.service/g' /usr/lib/systemd/system/glusterd.service && \
+sed -i'' -e 's/.*rpcbind.service.*/#Requires=rpcbind.service/' /lib/systemd/system/gluster-blockd.service && \
 sed -i 's/ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"/ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="systemd_end"/g' /usr/lib/udev/rules.d/99-systemd.rules && \
 mkdir -p /etc/glusterfs_bkp /var/lib/glusterd_bkp /var/log/glusterfs_bkp &&\
 cp -r /etc/glusterfs/* /etc/glusterfs_bkp &&\
@@ -43,10 +46,10 @@ RUN chmod 644 /etc/systemd/system/gluster-setup.service && \
 chmod 500 /usr/sbin/gluster-setup.sh && \
 systemctl disable nfs-server.service && \
 systemctl mask getty.target && \
-systemctl enable ntpd.service && \
 systemctl enable glusterd.service && \
-systemctl enable gluster-setup.service
+systemctl enable gluster-setup.service && \
+systemctl enable gluster-blockd.service
 
-EXPOSE 2222 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 49152 49153 49154 49156 49157 49158 49159 49160 49161 49162
+EXPOSE 2222 111 245 443 24007 24010 2049 3260 8080 6010 6011 6012 38465 38466 38468 38469 49152-49302
 
 CMD ["/usr/sbin/init"]