diff --git a/README.md b/README.md index 9dc37f1..20e8668 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ Docker MISP Container ===================== -### Latest Update: 10-10-2018 +### Latest Update: 12-12-2018 Following the Official MISP Ubuntu 18.04 LTS build instructions. -Latest Upstream Change Included: 2050c864a4d838e93e69b839763b72e4a76c979a +Latest Upstream Change Included: 9d0c6fa8fe6e8345f8053929bb18cc64007974a2 Github repo + build script here: https://github.com/harvard-itsecurity/docker-misp diff --git a/container/Dockerfile b/container/Dockerfile index 9fcde47..fe45c3d 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -40,16 +40,19 @@ RUN sed -i -E 's/^(\s*)system\(\);/\1unix-stream("\/dev\/log");/' /etc/syslog-ng WORKDIR /var/www/MISP RUN chown -R www-data:www-data /var/www/MISP /root/.config /root/.git; \ sudo -u www-data -H git clone https://github.com/MISP/MISP.git /var/www/MISP ; \ - sudo -u www-data -H git submodule init ; \ - sudo -u www-data -H git submodule update ; \ - sudo -u www-data -H git submodule foreach git config core.filemode false ; \ + sudo -u www-data -H git submodule update --init --recursive ; \ + sudo -u www-data -H git submodule foreach --recursive git config core.filemode false ; \ sudo -u www-data -H git config core.filemode false ; \ echo 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/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 python3 setup.py install WORKDIR /var/www/MISP/app/files/scripts/python-cybox RUN sudo python3 setup.py install @@ -60,10 +63,8 @@ RUN sudo python3 setup.py install WORKDIR /var/www/MISP/app/files/scripts/python-maec RUN sudo 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 python3 setup.py install +WORKDIR /var/www/MISP/cti-python-stix2 +RUN sudo python3 setup.py install WORKDIR /var/www/MISP RUN sudo -u www-data -H git submodule init ; \