summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNandaja Varma <nandaja.varma@gmail.com>2015-03-27 18:10:42 +0530
committerNandaja Varma <nandaja.varma@gmail.com>2015-03-27 18:10:42 +0530
commitfef58513b95b5426a6a82f8eb372935400710278 (patch)
treed323d8ec71bb7a38f8a2d5fffbb5e6c56ce5b44e
parentca13396ad8dc31b2072506bf3e3e76d4fec84a26 (diff)
downloadgluster-fef58513b95b5426a6a82f8eb372935400710278.tar.gz
gluster-fef58513b95b5426a6a82f8eb372935400710278.tar.bz2
gluster-fef58513b95b5426a6a82f8eb372935400710278.tar.xz
gluster-fef58513b95b5426a6a82f8eb372935400710278.zip
Fixing dockerfiles
-rw-r--r--.gitignore2
-rw-r--r--CentOS/.Dockerfile.swpbin12288 -> 0 bytes
-rw-r--r--CentOS/Dockerfile24
-rw-r--r--Fedora/Dockerfile23
4 files changed, 44 insertions, 5 deletions
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
--- a/CentOS/.Dockerfile.swp
+++ /dev/null
Binary files 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"]