summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamed Ashiq Liyazudeen <mliyazud@redhat.com>2017-05-08 20:38:13 +0530
committerMohamed Ashiq Liyazudeen <mliyazud@redhat.com>2017-05-08 20:59:05 +0530
commite63a97ed1b464975c9df07ea07dec3b136fa034a (patch)
tree90d8ad1d5caa732a83b521439b0d6b0bf3c9ba81
parentbd3aed1b4a11ed8816c6c556847c2fbba600837d (diff)
downloadgluster-e63a97ed1b464975c9df07ea07dec3b136fa034a.tar.gz
gluster-e63a97ed1b464975c9df07ea07dec3b136fa034a.tar.bz2
gluster-e63a97ed1b464975c9df07ea07dec3b136fa034a.tar.xz
gluster-e63a97ed1b464975c9df07ea07dec3b136fa034a.zip
Cleanup for the Unit tests
Signed-off-by: Mohamed Ashiq Liyazudeen <mliyazud@redhat.com>
-rw-r--r--CentOS/Dockerfile18
-rw-r--r--Fedora/Dockerfile15
-rw-r--r--gluster-client/Dockerfile23
-rw-r--r--gluster-object/CentOS/docker-gluster-swift/Dockerfile10
4 files changed, 55 insertions, 11 deletions
diff --git a/CentOS/Dockerfile b/CentOS/Dockerfile
index 7c0d448..e77a714 100644
--- a/CentOS/Dockerfile
+++ b/CentOS/Dockerfile
@@ -1,10 +1,20 @@
-FROM centos:latest
+FROM centos:7
MAINTAINER Humble Chirammal hchiramm@redhat.com Mohamed Ashiq Liyazudeen mliyazud@redhat.com
ENV container docker
-RUN yum --setopt=tsflags=nodocs -y update; yum clean all;
+LABEL architecture="x86_64" \
+ name="gluster/gluster-centos" \
+ version="3.10" \
+ vendor="Red Hat, Inc" \
+ summary="This image has a running glusterfs service ( CentOS 7 + Gluster 3.10)" \
+ io.k8s.display-name="Gluster 3.10 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 centos-release-gluster; yum clean all;
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/*;\
@@ -15,9 +25,7 @@ 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 nfs-utils attr iputils iproute centos-release-gluster
-
-RUN yum --setopt=tsflags=nodocs -y install openssh-server openssh-clients ntp rsync tar cronie sudo xfsprogs glusterfs glusterfs-server glusterfs-geo-replication;yum clean all;
+RUN yum --setopt=tsflags=nodocs -y install wget nfs-utils attr iputils iproute openssh-server openssh-clients ntp rsync tar cronie sudo xfsprogs glusterfs glusterfs-server glusterfs-geo-replication;yum clean all;
RUN sed -i '/Defaults requiretty/c\#Defaults requiretty' /etc/sudoers
diff --git a/Fedora/Dockerfile b/Fedora/Dockerfile
index 370417f..164732a 100644
--- a/Fedora/Dockerfile
+++ b/Fedora/Dockerfile
@@ -1,10 +1,21 @@
FROM fedora
-MAINTAINER Humble Chirammal hchiramm@redhat.com
+MAINTAINER Humble Chirammal hchiramm@redhat.com Mohamed Ashiq Liyazudeen mliyazud@redhat.com
ENV container docker
-RUN yum -y update && yum clean all
+LABEL architecture="x86_64" \
+ name="gluster/gluster-fedora" \
+ version="3.10" \
+ vendor="Red Hat, Inc" \
+ summary="This image has a running glusterfs service ( Fedora + Gluster 3.10)" \
+ io.k8s.display-name="Gluster 3.10 based on Fedora" \
+ io.k8s.description="Gluster Image is based on Fedora 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 fedora 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,gluster-fedora"
+
+
+RUN yum -y update && yum clean all;
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); \
diff --git a/gluster-client/Dockerfile b/gluster-client/Dockerfile
index 9b1d1d9..8621ef8 100644
--- a/gluster-client/Dockerfile
+++ b/gluster-client/Dockerfile
@@ -1,8 +1,23 @@
-FROM fedora
-MAINTAINER Humble Devassy Chirammal <hchiramm@redhat.com>
-LABEL Name="glusterfs-client"
+FROM fedora
+
+MAINTAINER Humble Devassy Chirammal <hchiramm@redhat.com>
+
+LABEL architecture="x86_64" \
+ name="gluster/glusterfs-client" \
+ version="3.10" \
+ vendor="Red Hat, Inc" \
+ summary="This image has a running glusterfs service ( Fedora + Gluster 3.10 client)" \
+ io.k8s.display-name="Gluster 3.10 client based on Fedora" \
+ io.k8s.description="Gluster Client Image is based on Fedora Image which is used to mount a glusterfs volume." \
+ description="Gluster Client Image is based on Fedora Image which is used to mount a glusterfs volume." \
+ io.openshift.tags="gluster,glusterfs,glusterfs-client"
+
ENV container docker
-RUN dnf --setopt=tsflags=nodocs -y update; dnf clean all; dnf --setopt=tsflags=nodocs -y install wget nfs-utils attr iputils iproute;
+
+RUN dnf --setopt=tsflags=nodocs -y update; dnf --setopt=tsflags=nodocs -y install wget nfs-utils attr iputils iproute; dnf clean all;
+
RUN sed -i "s/LANG/\#LANG/g" /etc/locale.conf
+
RUN dnf install -y glusterfs-fuse; dnf clean all;
+
CMD ["/bin/bash"]
diff --git a/gluster-object/CentOS/docker-gluster-swift/Dockerfile b/gluster-object/CentOS/docker-gluster-swift/Dockerfile
index 65599ec..e83a46e 100644
--- a/gluster-object/CentOS/docker-gluster-swift/Dockerfile
+++ b/gluster-object/CentOS/docker-gluster-swift/Dockerfile
@@ -9,6 +9,16 @@ MAINTAINER Prashanth Pai <ppai@redhat.com>
# Install gluster-swift dependencies. To be removed when RPMs become available.
# Clean downloaded packages and index
+LABEL architecture="x86_64" \
+ name="gluster/gluster-swift" \
+ version="kilo" \
+ vendor="Red Hat, Inc" \
+ summary="This image has a running gluster-swift service ( centos 7 + gluster-swift)" \
+ io.k8s.display-name="gluster-swift based on centos 7" \
+ io.k8s.description="gluster-swift image is based on centos image which enables files and directories created on GlusterFS to be accessed as objects via the Swift and S3 API." \
+ description="gluster-swift image is based on centos image which enables files and directories created on GlusterFS to be accessed as objects via the Swift and S3 API." \
+ io.openshift.tags="gluster,glusterfs,gluster-swift"
+
RUN yum -v --setopt=tsflags=nodocs -y update && \
yum -v --setopt=tsflags=nodocs -y install \
centos-release-openstack-kilo \