From 939d98e4522d026e52c0350883e714921c01c54d Mon Sep 17 00:00:00 2001
From: Ventz Petkov <ventz_petkov@harvard.edu>
Date: Wed, 20 Nov 2019 21:53:21 -0500
Subject: [PATCH] Merge of PR by Kortho - cleaned up pip3 install -
 https://github.com/MISP/docker-misp/pull/11

---
 README.md            |  2 +-
 container/Dockerfile | 45 +++++++++++++-------------------------------
 2 files changed, 14 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index d44f282..cd155e7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 Docker MISP Container
 =====================
-### Latest Update: 5-21-2019
+### Latest Update: 11-20-2019
 
 Following the Official MISP Ubuntu 18.04 LTS build instructions.
 
diff --git a/container/Dockerfile b/container/Dockerfile
index f6c3a4f..2d6c909 100644
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -49,45 +49,26 @@ RUN chown -R www-data:www-data /var/www/MISP /root/.config /root/.git; \
     sudo -u www-data -H git config core.filemode false ; \
     echo
 
-RUN sudo pip3 install --upgrade pip
-
-WORKDIR /var/www/MISP/app/files/scripts
-RUN sudo -u www-data -H git clone https://github.com/CybOXProject/python-cybox.git ; \
-    sudo -u www-data -H git clone https://github.com/STIXProject/python-stix.git ; \
-    sudo -u www-data -H git clone https://github.com/MAECProject/python-maec.git ; \
-    sudo -u www-data -H git clone https://github.com/CybOXProject/mixbox.git
-
-WORKDIR /var/www/MISP/app/files/scripts/mixbox
-RUN sudo pip3 install .
-
-WORKDIR /var/www/MISP/app/files/scripts/python-cybox
-RUN sudo pip3 install .
-
-WORKDIR /var/www/MISP/app/files/scripts/python-stix
-RUN sudo pip3 install .
-
-WORKDIR /var/www/MISP/app/files/scripts/python-maec
-RUN sudo pip3 install .
-
-WORKDIR /var/www/MISP/cti-python-stix2
-RUN sudo pip3 install .
-
-WORKDIR /var/www/MISP/PyMISP
-RUN sudo pip3 install . ; \
+RUN sudo pip3 install --upgrade pip ; \
+    sudo pip3 install git+https://github.com/CybOXProject/mixbox.git ; \
+    sudo pip3 install git+https://github.com/CybOXProject/python-cybox.git ; \
+    sudo pip3 install git+https://github.com/STIXProject/python-stix.git ; \
+    sudo pip3 install git+https://github.com/MAECProject/python-maec.git ; \
+    sudo pip3 install /var/www/MISP/cti-python-stix2 ; \
+    sudo pip3 install /var/www/MISP/PyMISP ; \
     sudo pip3 install git+https://github.com/kbandla/pydeep.git ; \
-    sudo pip3 install https://github.com/lief-project/packages/raw/lief-master-latest/pylief-0.9.0.dev.zip
+    sudo pip3 install https://github.com/lief-project/packages/raw/lief-master-latest/pylief-0.9.0.dev.zip ; \
+    sudo pip3 install jsonschema ; \
+    sudo pip3 install reportlab ; \
+    sudo pip3 install python-magic ; \
+    sudo pip3 install pyzmq ; \
+    sudo pip3 install redis
 
 
 WORKDIR /var/www/MISP
 RUN sudo -u www-data -H git submodule init ; \
     sudo -u www-data -H git submodule update
 
-RUN sudo pip3 install jsonschema ; \
-    sudo pip3 install reportlab ; \
-    sudo pip3 install python-magic ; \
-    sudo pip3 install pyzmq ; \
-    sudo pip3 install redis
-
 WORKDIR /usr/local/src
 RUN sudo -H git clone https://github.com/MISP/misp-modules.git