From 00f7cb992cb77a86c12de63b3a23041c10938ee6 Mon Sep 17 00:00:00 2001 From: Filip Valder Date: Fri, 11 Nov 2016 15:11:15 +0100 Subject: [PATCH] format: can be more easily compared with Dockerfile side-by-side --- jenkins-check-Dockerfile | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/jenkins-check-Dockerfile b/jenkins-check-Dockerfile index 5fd552c7..756e51a2 100644 --- a/jenkins-check-Dockerfile +++ b/jenkins-check-Dockerfile @@ -1,15 +1,34 @@ # This is what jenkins uses to check, roughly +# Those parts starting with `###' were taken from Dockerfile just for some +# overview on what's happening there. FROM fedora:24 # so we don't have to compile those when fetched from PyPI -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/module_build_service/ +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/module_build_service/ + ###&& mkdir /etc/module_build_service WORKDIR /opt/module_build_service/ COPY ./requirements.txt /opt/module_build_service/ RUN pip install --user -r ./requirements.txt +###RUN ln -s /opt/module_build_service/koji.conf /etc/module_build_service/koji.conf \ +### && ln -s /opt/module_build_service/copr.conf /etc/module_build_service/copr.conf \ +### && ln -s /opt/module_build_service/krb5-stg.fp.o /etc/krb5.conf.d/stg_fedoraproject_org + # This isn't what we do in jenkins, blah ... # RUN pip install --upgrade -r test-requirements.txt