From fef58513b95b5426a6a82f8eb372935400710278 Mon Sep 17 00:00:00 2001
From: Nandaja Varma <nandaja.varma@gmail.com>
Date: Fri, 27 Mar 2015 18:10:42 +0530
Subject: Fixing dockerfiles

---
 .gitignore             |   2 ++
 CentOS/.Dockerfile.swp | Bin 12288 -> 0 bytes
 CentOS/Dockerfile      |  24 +++++++++++++++++++++---
 Fedora/Dockerfile      |  23 +++++++++++++++++++++--
 4 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 CentOS/.Dockerfile.swp

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3819313
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+*.swo
diff --git a/CentOS/.Dockerfile.swp b/CentOS/.Dockerfile.swp
deleted file mode 100644
index 69f65bc..0000000
Binary files a/CentOS/.Dockerfile.swp and /dev/null differ
diff --git a/CentOS/Dockerfile b/CentOS/Dockerfile
index 4c146c5..a43e13f 100644
--- a/CentOS/Dockerfile
+++ b/CentOS/Dockerfile
@@ -2,23 +2,41 @@ FROM centos
 
 MAINTAINER Humble Chirammal hchiramm@redhat.com
 
+ENV container docker
+
+RUN yum --setopt=tsflags=nodocs -y update
+
 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); \
+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/*;
+
 RUN wget http://download.gluster.org/pub/gluster/glusterfs/3.6/LATEST/CentOS/glusterfs-epel.repo -O /etc/yum.repos.d/glusterfs-epel.repo
 
-RUN yum --setopt=tsflags=nodocs -y update
+RUN yum -y update
 
-RUN yum --setopt=tsflags=nodocs -y install systemd
 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 clean all
 
-RUN ssh-keygen -A
 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
 
+RUN systemctl enable rpcbind.service
+RUN systemctl enable sshd.service
 CMD ["/usr/sbin/init"]
diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile
index a6ddeee..908ba38 100644
--- a/Fedora/Dockerfile
+++ b/Fedora/Dockerfile
@@ -1,16 +1,33 @@
-FROM fedora
+FROM fedora:21
 
 MAINTAINER Humble Chirammal hchiramm@redhat.com
 
+ENV container docker
+
+RUN yum -y update && yum clean all
+
+RUN yum --setopt=tsflags=nodocs -y install deltarpm
+
+RUN yum -y install systemd; 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/*;\
+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/*;
+
 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 wget http://download.gluster.org/pub/gluster/glusterfs/3.6/LATEST/Fedora/glusterfs-fedora.repo -O /etc/yum.repos.d/glusterfs-fedora.repo
 
 RUN yum --setopt=tsflags=nodocs -y update
 
-RUN yum --setopt=tsflags=nodocs -y install systemd
 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 clean all
@@ -21,4 +38,6 @@ 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
 
+RUN systemctl enable rpcbind.service
+RUN systemctl enable sshd.service
 CMD ["/usr/sbin/init"]
-- 
cgit v1.2.1