Minor cleanup of dockerfile

pull/1/head
Jason Kendall 2019-11-28 12:11:48 -05:00
parent 18a7e8919a
commit 7a7f936391
1 changed files with 3 additions and 5 deletions

View File

@ -1,5 +1,4 @@
FROM debian:buster-slim as php-build FROM debian:buster-slim as php-build
RUN apt-get update; apt-get install -y --no-install-recommends \ RUN apt-get update; apt-get install -y --no-install-recommends \
gcc \ gcc \
make \ make \
@ -12,7 +11,6 @@ FROM debian:buster-slim as php-build
RUN cp /usr/lib/x86_64-linux-gnu/libfuzzy.* /usr/lib; pecl install ssdeep RUN cp /usr/lib/x86_64-linux-gnu/libfuzzy.* /usr/lib; pecl install ssdeep
FROM debian:buster-slim as python-build FROM debian:buster-slim as python-build
RUN apt-get update; apt-get install -y --no-install-recommends \ RUN apt-get update; apt-get install -y --no-install-recommends \
gcc \ gcc \
@ -102,8 +100,8 @@ ARG PHP_VER=20180731
RUN pip3 install --no-cache-dir /tmp/*.whl plyara pyzmq redis python-magic lief RUN pip3 install --no-cache-dir /tmp/*.whl plyara pyzmq redis python-magic lief
# CakePHP # PHP
# Once done, install CakeResque, first get latest composer # Install ssdeep prebuild, latest composer, then install the app's PHP deps
COPY --from=php-build /usr/lib/php/${PHP_VER}/ssdeep.so /usr/lib/php/${PHP_VER}/ssdeep.so COPY --from=php-build /usr/lib/php/${PHP_VER}/ssdeep.so /usr/lib/php/${PHP_VER}/ssdeep.so
COPY --from=composer:latest /usr/bin/composer /usr/bin/composer COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
WORKDIR /var/www/MISP/app WORKDIR /var/www/MISP/app
@ -117,7 +115,7 @@ ARG PHP_VER=20180731
# To use the scheduler worker for scheduled tasks, do the following: # To use the scheduler worker for scheduled tasks, do the following:
;cp -fa /var/www/MISP/INSTALL/setup/config.php /var/www/MISP/app/Plugin/CakeResque/Config/config.php ;cp -fa /var/www/MISP/INSTALL/setup/config.php /var/www/MISP/app/Plugin/CakeResque/Config/config.php
# Configure Apache # Apache
# add HTTP MISP Config # add HTTP MISP Config
RUN rm /etc/apache2/sites-enabled/*; RUN rm /etc/apache2/sites-enabled/*;
COPY files/etc/apache2/sites-enabled/misp.conf /etc/apache2/sites-enabled/ COPY files/etc/apache2/sites-enabled/misp.conf /etc/apache2/sites-enabled/