From 81a0931d9b592ce486687cdbfc462e954f623a75 Mon Sep 17 00:00:00 2001
From: hchiramm <hchiramm@redhat.com>
Date: Fri, 4 Dec 2015 15:30:45 +0530
Subject: Updating this image to fedora:latest as base instead of fedora 21

Signed-off-by: hchiramm <hchiramm@redhat.com>
---
 Fedora/Dockerfile | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'Fedora/Dockerfile')

diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile
index 1a17abe..ce33157 100644
--- a/Fedora/Dockerfile
+++ b/Fedora/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:21
+FROM fedora
 
 MAINTAINER Humble Chirammal hchiramm@redhat.com
 
@@ -6,8 +6,6 @@ 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/*;\
@@ -18,23 +16,8 @@ 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.7/LATEST/Fedora/glusterfs-fedora.repo -O /etc/yum.repos.d/glusterfs-fedora.repo
+RUN yum --setopt=tsflags=nodocs -y install wget nfs-utils iputils iproute attr glusterfs glusterfs-server glusterfs-geo-replication openssh-server; yum clean all
 
-RUN yum --setopt=tsflags=nodocs -y update
-
-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 ssh-keygen -A
 RUN echo 'root:password' | chpasswd
 VOLUME [ “/sys/fs/cgroup” ]
 
@@ -42,6 +25,6 @@ EXPOSE 22 111 245 443 24007 2049 8080 6010 6011 6012 38465 38466 38468 38469 491
 
 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