From 3f38fd0b62eb0e2397e9bef4bcf8227a33f5361c Mon Sep 17 00:00:00 2001
From: Jonathan Holloway <jholloway@redhat.com>
Date: Wed, 9 Aug 2017 01:02:37 -0500
Subject: fix dockerfile gdeploy PyYAML pip/rpm conflict

* PyYAML is already installed via pip form glusto image and
    gdeploy installs PyYAML as dependency from rpm. The resulting
    conflict fails the container build.

Dockerfile: changed order of install, added glusto and pylint/pep8
defaults.yml: sets glusto defaults in container image

Change-Id: I47eaa1fbe74cc619043d975034083c5766e6acd1
Signed-off-by: Jonathan Holloway <jholloway@redhat.com>
---
 docker/Dockerfile            | 27 +++++++++++++++++++--------
 docker/defaults/defaults.yml |  3 +++
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 docker/defaults/defaults.yml

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f51ab660d..675de2192 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,14 +1,25 @@
-FROM loadtheaccumulator/glusto
+FROM fedora
 MAINTAINER loadtheaccumulator@gmail.com
+
+# install gdeploy first due to pip/rpm PyYAML conflict
+RUN dnf install -y wget
+RUN wget -q https://copr.fedorainfracloud.org/coprs/sac/gdeploy/repo/fedora-26/sac-gdeploy-fedora-26.repo -O /etc/yum.repos.d/gdeploy.repo
+RUN dnf install -y gdeploy-*
+
+# install glusto
+RUN dnf install -y git
+RUN dnf install -y python-pip
+RUN pip install --upgrade pip
+RUN pip install --upgrade git+git://github.com/loadtheaccumulator/glusto.git
+RUN mkdir /etc/glusto/
+COPY defaults/defaults.yml /etc/glusto/
+
 # install glusto-tests libraries
 RUN cd /; git clone http://github.com/gluster/glusto-tests
 RUN cd /glusto-tests/glustolibs-gluster; python setup.py install
 RUN cd /glusto-tests/glustolibs-io; python setup.py install
 RUN cd /glusto-tests/glustolibs-misc; python setup.py install
-# install gdeploy
-#RUN pip install --upgrade pip
-#RUN dnf install -y gcc
-#RUN pip install --upgrade git+git://github.com/gluster/gdeploy.git
-RUN dnf install -y wget
-RUN wget -q https://copr-be.cloud.fedoraproject.org/results/sac/gdeploy/fedora-25-x86_64/00549451-gdeploy/gdeploy-2.0.2-7.noarch.rpm
-RUN dnf install -y gdeploy-*
+
+# install dev extras
+RUN dnf install -y pylint
+RUN dnf install -y python-pep8
diff --git a/docker/defaults/defaults.yml b/docker/defaults/defaults.yml
new file mode 100644
index 000000000..84d8e104d
--- /dev/null
+++ b/docker/defaults/defaults.yml
@@ -0,0 +1,3 @@
+ssh_keyfile: "~/.ssh/id_rsa"
+use_controlpersist: True
+log_color: True
-- 
cgit