From b7f298883392095f1d111cd314c3451a2b224b0c Mon Sep 17 00:00:00 2001
From: hchiramm <hchiramm@redhat.com>
Date: Fri, 4 Dec 2015 16:13:30 +0530
Subject: Updating to latest CentOS base image and GlusterFS version

Signed-off-by: hchiramm <hchiramm@redhat.com>
---
 CentOS/Dockerfile | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/CentOS/Dockerfile b/CentOS/Dockerfile
index 2d393d8..4e2098b 100644
--- a/CentOS/Dockerfile
+++ b/CentOS/Dockerfile
@@ -4,18 +4,9 @@ MAINTAINER Humble Chirammal hchiramm@redhat.com
 
 ENV container docker
 
-RUN yum --setopt=tsflags=nodocs -y update
+RUN yum --setopt=tsflags=nodocs -y update; yum clean all;
 
-RUN yum --setopt=tsflags=nodocs -y install wget
-
-RUN yum --setopt=tsflags=nodocs -y install nfs-utils
-
-RUN yum --setopt=tsflags=nodocs -y install openssh-server
-
-RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
-
-RUN yum -y update; yum clean all; \
-(cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+RUN (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/*; \
@@ -24,22 +15,23 @@ 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/*;
 
-RUN wget http://download.gluster.org/pub/gluster/glusterfs/3.7/LATEST/CentOS/glusterfs-epel.repo -O /etc/yum.repos.d/glusterfs-epel.repo
+RUN yum --setopt=tsflags=nodocs -y install wget nfs-utils attr iputils iproute
 
-RUN yum -y update
+RUN wget http://download.gluster.org/pub/gluster/glusterfs/3.7/LATEST/EPEL.repo/glusterfs-epel.repo -O /etc/yum.repos.d/glusterfs-epel.repo
+
+RUN wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm; rpm -ivh epel-release-7-5.noarch.rpm; rm epel-release-7-5.noarch.rpm;
+
+RUN yum --setopt=tsflags=nodocs -y install glusterfs glusterfs-server glusterfs-geo-replication openssh-server
 
-RUN yum --setopt=tsflags=nodocs -y install glusterfs glusterfs-server glusterfs-fuse glusterfs-geo-replication glusterfs-cli glusterfs-api
-RUN yum --setopt=tsflags=nodocs -y install attr
-RUN yum --setopt=tsflags=nodocs -y install iputils iproute
 RUN yum clean all
 
 RUN echo 'root:password' | chpasswd
 VOLUME [ “/sys/fs/cgroup” ]
 
-EXPOSE 22 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 49152 49153 49154 49156 49157 49158 49159 49160 49161 49162
+EXPOSE 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 49152 49153 49154 49156 49157 49158 49159 49160 49161 49162
 
 RUN systemctl disable nfs-server.service
 RUN systemctl enable rpcbind.service
-RUN systemctl enable sshd.service
 RUN systemctl enable glusterd.service
+
 CMD ["/usr/sbin/init"]
-- 
cgit v1.2.3