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

Merge pull request #53 from giedriusramas/fearture/move-arg-to-places-first-used 

move ARG to the places where they first used, to allow for Docker layer re-use and speedup during build when making changes (ex: multiple deployments) - thanks @giedriusramas
pull/19/head
Ventz Petkov 2020-04-30 02:06:26 -04:00 committed by GitHub
parent d7eda5bfc8 ae415b8600
commit d954df2b20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
container/Dockerfile
View File

@ -1,13 +1,16 @@
# User supplied inputs - (see bellow within Dockerfile for real ARGS that you can replace)
# // DO NOT TOUCH HERE - THIS SECTION IS NOT USED - SIMPLY USED AS README //
##################################################################
# ARG MYSQL_MISP_PASSWORD=ChangeThisDefaultPassworda9564ebc3289b7a14551baf8ad5ec60a
# ARG POSTFIX_RELAY_HOST=localhost
# ARG MISP_FQDN=localhost
# ARG MISP_EMAIL=admin@localhost
# ARG MISP_GPG_PASSWORD=ChangeThisDefaultPasswordXuJBao5Q2bps89LWFqWkKgDZwAFpNHvc
##################################################################
# ^^^ DO NOT TOUCH HERE - THIS SECTION IS NOT USED - SIMPLY USED AS README ^^^
FROM ubuntu:18.04 FROM ubuntu:18.04
MAINTAINER Ventz Petkov <ventz_petkov@harvard.edu> MAINTAINER Ventz Petkov <ventz_petkov@harvard.edu>
# User supplied inputs
ARG MYSQL_MISP_PASSWORD=ChangeThisDefaultPassworda9564ebc3289b7a14551baf8ad5ec60a
ARG POSTFIX_RELAY_HOST=localhost
ARG MISP_FQDN=localhost
ARG MISP_EMAIL=admin@localhost
ARG MISP_GPG_PASSWORD=ChangeThisDefaultPasswordXuJBao5Q2bps89LWFqWkKgDZwAFpNHvc
# Dir you need to override to keep data on reboot/new container: # Dir you need to override to keep data on reboot/new container:
VOLUME /var/lib/mysql VOLUME /var/lib/mysql
#VOLUME /var/www/MISP/Config #VOLUME /var/www/MISP/Config
@ -29,6 +32,8 @@ RUN sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.2/ap
sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/" /etc/php/7.2/apache2/php.ini ; \ sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 50M/" /etc/php/7.2/apache2/php.ini ; \
sed -i "s/post_max_size = 8M/post_max_size = 50M/" /etc/php/7.2/apache2/php.ini sed -i "s/post_max_size = 8M/post_max_size = 50M/" /etc/php/7.2/apache2/php.ini
ARG POSTFIX_RELAY_HOST=localhost
#echo "test -e /var/run/mysqld || install -m 755 -o mysql -g root -d /var/run/mysqld" ; \ #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 ; \ RUN sed -i -E 's/^(\s*)system\(\);/\1unix-stream("\/dev\/log");/' /etc/syslog-ng/syslog-ng.conf ; \
postconf -e "relayhost = $POSTFIX_RELAY_HOST" ; \ postconf -e "relayhost = $POSTFIX_RELAY_HOST" ; \
@ -78,6 +83,8 @@ RUN sudo -H git checkout ; \
sudo pip3 install -I . sudo pip3 install -I .
#RUN sudo pip uninstall -y cybox #RUN sudo pip uninstall -y cybox
ARG MISP_FQDN=localhost
ARG MISP_EMAIL=admin@localhost
WORKDIR /var/www/MISP/app WORKDIR /var/www/MISP/app
RUN mkdir /var/www/.composer && chown -R www-data:www-data /var/www/.composer ; \ RUN mkdir /var/www/.composer && chown -R www-data:www-data /var/www/.composer ; \
@ -124,6 +131,9 @@ RUN mkdir /var/www/.composer && chown -R www-data:www-data /var/www/.composer ;
sudo -u www-data cp -a /var/www/MISP/app/Config/core.default.php /var/www/MISP/app/Config/core.php ; \ sudo -u www-data cp -a /var/www/MISP/app/Config/core.default.php /var/www/MISP/app/Config/core.php ; \
sudo -u www-data cp -a /var/www/MISP/app/Config/config.default.php /var/www/MISP/app/Config/config.php sudo -u www-data cp -a /var/www/MISP/app/Config/config.default.php /var/www/MISP/app/Config/config.php
ARG MYSQL_MISP_PASSWORD=ChangeThisDefaultPassworda9564ebc3289b7a14551baf8ad5ec60a
ARG MISP_GPG_PASSWORD=ChangeThisDefaultPasswordXuJBao5Q2bps89LWFqWkKgDZwAFpNHvc
RUN sed -i -e 's/db login/misp/g' /var/www/MISP/app/Config/database.php ; \ RUN sed -i -e 's/db login/misp/g' /var/www/MISP/app/Config/database.php ; \
sed -i -e "s/db password/${MYSQL_MISP_PASSWORD}/g" /var/www/MISP/app/Config/database.php ; \ sed -i -e "s/db password/${MYSQL_MISP_PASSWORD}/g" /var/www/MISP/app/Config/database.php ; \
sed -i -E "s/'salt'(\s+)=>\s''/'salt' => '`openssl rand -base64 32 | tr \'/\' \'0\'`'/" /var/www/MISP/app/Config/config.php ; \ sed -i -E "s/'salt'(\s+)=>\s''/'salt' => '`openssl rand -base64 32 | tr \'/\' \'0\'`'/" /var/www/MISP/app/Config/config.php ; \