Merge branch 'master' into master

Xavier Mertens 2019-05-02 22:09:26 +02:00 committed by GitHub
commit f638488e93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions

View File

@ -70,6 +70,14 @@ WORKDIR /var/www/MISP
RUN git submodule init
RUN git submodule update
WORKDIR /var/www/MISP/app
# FIX COMPOSER
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
RUN php -r "if (hash_file('sha384', 'composer-setup.php') === '48e3236262b34d30969dca3c37281b3b4bbe3221bda826ac6a9$
RUN php composer-setup.php
RUN php -r "unlink('composer-setup.php');"
# END FIX
RUN php composer.phar config vendor-dir Vendor
RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
@ -140,9 +148,13 @@ RUN sudo apt-get -y install libpoppler58 libpoppler-dev libpoppler-cpp-dev
# Install MISP Modules
WORKDIR /opt
RUN apt-get install -y python3 python3-pip libjpeg-dev
# PIP3 fix
RUN pip install --upgrade pip
# END FIX
RUN git clone https://github.com/MISP/misp-modules.git
WORKDIR /opt/misp-modules
RUN pip3 install --upgrade pip
RUN cat REQUIREMENTS | sed 's/aiohttp==3.4.4/aiohttp/g' > REQUIREMENTS
RUN pip3 install --upgrade --ignore-installed urllib3
RUN pip3 install --upgrade --ignore-installed requests