MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Use python 3 system package versions 

We no longer need Python 2 packages
Chris Halls 2020-01-10 12:11:58 +01:00
parent 9a314ca85a
commit 74934c755c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/Dockerfile
View File

@ -39,14 +39,12 @@ RUN sed -i "s/max_execution_time = 30/max_execution_time = 300/" \
sed -i "s/post_max_size = 8M/post_max_size = 50M/" \ sed -i "s/post_max_size = 8M/post_max_size = 50M/" \
/etc/php/7.2/apache2/php.ini /etc/php/7.2/apache2/php.ini
RUN apt-get install -y python-dev python-pip libxml2-dev libxslt1-dev \ RUN apt-get install -y python3-dev python3-pip python3-setuptools \
zlib1g-dev python-setuptools libfuzzy-dev python-lxml python3-lxml && \ python3-lxml libjpeg-dev \
libxml2-dev libxslt1-dev zlib1g-dev libfuzzy-dev && \
apt-get install -y cron logrotate supervisor syslog-ng-core && \ apt-get install -y cron logrotate supervisor syslog-ng-core && \
apt-get clean apt-get clean
# update setuptools because otherwise you'' get python errors
RUN pip install --upgrade setuptools
WORKDIR /var/www WORKDIR /var/www
RUN chown www-data:www-data /var/www RUN chown www-data:www-data /var/www
USER www-data USER www-data
@ -147,7 +145,6 @@ RUN sudo -E apt-get -y install libpoppler73 libpoppler-dev libpoppler-cpp-dev
# Install MISP Modules # Install MISP Modules
WORKDIR /opt WORKDIR /opt
RUN apt-get install -y python3 python3-pip libjpeg-dev
RUN git clone https://github.com/MISP/misp-modules.git RUN git clone https://github.com/MISP/misp-modules.git
RUN cd misp-modules && \ RUN cd misp-modules && \
pip3 install -I -r REQUIREMENTS && \ pip3 install -I -r REQUIREMENTS && \