diff options
| author | Jonathan Holloway <jholloway@redhat.com> | 2017-08-09 01:02:37 -0500 |
|---|---|---|
| committer | Jonathan Holloway <jholloway@redhat.com> | 2017-08-09 01:03:31 -0500 |
| commit | 3f38fd0b62eb0e2397e9bef4bcf8227a33f5361c (patch) | |
| tree | 3444f3ae9c410547e4130997700cfc1beaebb8f8 /docker/Dockerfile | |
| parent | 67925826933fefa6bd778e288880e6bddc08cec9 (diff) | |
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>
Diffstat (limited to 'docker/Dockerfile')
| -rw-r--r-- | docker/Dockerfile | 27 |
1 files changed, 19 insertions, 8 deletions
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 |