From 33b9234acd3daba7417928435c7f102eaeda3566 Mon Sep 17 00:00:00 2001 From: Matt Prahl Date: Mon, 10 Oct 2016 13:05:00 -0400 Subject: [PATCH 1/2] Change the Jenkins Dockerfile to only have the build dependencies to install via pip --- jenkins-check-Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-check-Dockerfile b/jenkins-check-Dockerfile index 7f10315e..0e84fa4e 100644 --- a/jenkins-check-Dockerfile +++ b/jenkins-check-Dockerfile @@ -3,7 +3,7 @@ FROM fedora:24 # so we don't have to compile those when fetched from PyPI -RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client && \ +RUN dnf install -y python python-virtualenv python-devel libffi-devel redhat-rpm-config openssl-devel gcc gcc-c++ koji git swig && \ dnf autoremove -y && dnf clean all && \ mkdir /opt/fm-orchestrator/ WORKDIR /opt/fm-orchestrator/ From 81e6b69b371dada24596b479d32e0e063222039a Mon Sep 17 00:00:00 2001 From: Matt Prahl Date: Mon, 10 Oct 2016 13:07:34 -0400 Subject: [PATCH 2/2] Use the m2ext RPM instead of install via pip in Docker --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7f04e0fb..c646ed2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM fedora:24 # so we don't have to compile those when fetched from PyPI -RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client swig && \ +RUN dnf install -y python-pip python2-setuptools python2-cffi python2-zmq python2-cryptography koji python2-pdc-client python-m2ext && \ dnf autoremove -y && dnf clean all && \ mkdir /opt/fm-orchestrator/ WORKDIR /opt/fm-orchestrator/