From 120e1eb84a573d7cd98e62da51aa38a5753b2e01 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 26 Oct 2016 15:45:42 -0400 Subject: [PATCH 1/3] Reformat this line to be more maintainable. --- Dockerfile | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 150e85f6..a7a49462 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,25 @@ 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 python-m2ext fedmsg-relay python-mock && \ - dnf autoremove -y && dnf clean all && \ - mkdir /opt/module_build_service/ && mkdir /etc/module_build_service +RUN dnf install -y \ + python-pip \ + python2-setuptools \ + python2-cffi \ + python2-zmq \ + python2-cryptography \ + koji \ + python2-pdc-client \ + python-m2ext \ + fedmsg-relay \ + python-mock \ + && \ + 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 From c025aeeff6d2572b509dbe2e3978dc4373297076 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Wed, 26 Oct 2016 15:46:07 -0400 Subject: [PATCH 2/3] Add the git package to the docker image. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a7a49462..3cff4172 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,6 +12,7 @@ RUN dnf install -y \ python-m2ext \ fedmsg-relay \ python-mock \ + git \ && \ dnf autoremove -y \ && \ From 3d7cbfbc112e5da3cade34d70d5b0eda4ec53eeb Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 27 Oct 2016 04:48:16 -0400 Subject: [PATCH 3/3] Adjust indentation. --- Dockerfile | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3cff4172..6e490815 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,25 +2,21 @@ 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 \ - python-m2ext \ - fedmsg-relay \ - python-mock \ - git \ - && \ - dnf autoremove -y \ - && \ - dnf clean all \ - && \ - mkdir /opt/module_build_service/ \ - && \ - mkdir /etc/module_build_service + python-pip \ + python2-setuptools \ + python2-cffi \ + python2-zmq \ + python2-cryptography \ + koji \ + python2-pdc-client \ + python-m2ext \ + fedmsg-relay \ + python-mock \ + git \ + && 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