From 3f50fbf7cb7ff1aad48db2ccf7554136448e572e Mon Sep 17 00:00:00 2001
From: Ventz Petkov <ventz_petkov@harvard.edu>
Date: Thu, 31 May 2018 21:27:02 -0400
Subject: [PATCH] Upstream update to install process:
 9c134881ba836ae10919c3618fbc6541efb04a28 and
 98414cf2befa0757e1d2c3aac85c6a226d366f75 and
 1b72988e56b0118862fe61c1e60acab134c5073d - includes updated install and move
 to python3 for stix, cybox, and mixbox libraries. Install pymisp for python3.

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

diff --git a/README.md b/README.md
index 42a70f8..08e60eb 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 Docker MISP Container
 =====================
-### Latest Update: 4-10-2018
+### Latest Update: 5-31-2018
 
-Latest Upstream Change Included: 6df6cc79bc0dbbc0307d57767ac47c09f1a0bf1c
+Latest Upstream Change Included: 1b72988e56b0118862fe61c1e60acab134c5073d
 
 Github repo + build script here:
 https://github.com/harvard-itsecurity/docker-misp
diff --git a/container/Dockerfile b/container/Dockerfile
index dfd90b1..7d34b86 100644
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -20,7 +20,7 @@ VOLUME /var/lib/mysql
 EXPOSE 80 443 3306 6379 50000
 
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y supervisor cron logrotate syslog-ng-core postfix curl gcc git gnupg-agent make python openssl redis-server sudo vim zip wget mariadb-client mariadb-server apache2 apache2-doc apache2-utils libapache2-mod-php php php-cli php-crypt-gpg php-dev php-json php-mysql php-opcache php-readline php-redis python-dev python-pip libxml2-dev libxslt1-dev zlib1g-dev python-setuptools rng-tools python3 python3-dev python3-pip libpq5 libjpeg-dev
+RUN apt-get update && apt-get install -y supervisor cron logrotate syslog-ng-core postfix curl gcc git gnupg-agent make python python3 openssl redis-server sudo vim zip wget mariadb-client mariadb-server apache2 apache2-doc apache2-utils libapache2-mod-php php php-cli php-crypt-gpg php-dev php-json php-mysql php-opcache php-readline php-redis rng-tools python3-dev python3-pip libxml2-dev libxslt1-dev zlib1g-dev python-setuptools libpq5 libjpeg-dev
 
     #echo "test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld" ; \
 RUN sed -i -E 's/^(\s*)system\(\);/\1unix-stream("\/dev\/log");/' /etc/syslog-ng/syslog-ng.conf ; \
@@ -44,23 +44,23 @@ RUN sudo -u www-data -H git clone https://github.com/CybOXProject/python-cybox.g
     sudo -u www-data -H git clone https://github.com/STIXProject/python-stix.git
 
 WORKDIR /var/www/MISP/app/files/scripts/python-cybox
-RUN sudo -u www-data -H git checkout v2.1.0.12 ; \
-    python setup.py install
+RUN python3 setup.py install
 
 WORKDIR /var/www/MISP/app/files/scripts/python-stix
-RUN sudo -u www-data -H git checkout v1.1.1.4 ; \
-    python setup.py install
+RUN python3 setup.py install
 
 WORKDIR /var/www/MISP/app/files/scripts/
 RUN sudo -u www-data -H git clone https://github.com/CybOXProject/mixbox.git ; \
     cd /var/www/MISP/app/files/scripts/mixbox ; \
-    sudo -u www-data -H git checkout v1.0.2 ; \
-    python setup.py install
+    python3 setup.py install
 
 WORKDIR /var/www/MISP
 RUN sudo -u www-data -H git submodule init ; \
     sudo -u www-data -H git submodule update
 
+WORKDIR /var/www/MISP/PyMISP
+RUN python3 setup.py install
+
 WORKDIR /usr/local/src
 RUN sudo -H git clone https://github.com/MISP/misp-modules.git