From 33a557d8fbad96be952f2e294db880769d2ac03a Mon Sep 17 00:00:00 2001 From: ram71138 Date: Wed, 29 Apr 2020 22:14:52 +0300 Subject: [PATCH] moving ARG to place where they are first used to get better docker layer reuse --- container/Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/container/Dockerfile b/container/Dockerfile index 98bb5f3..0385bcc 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -1,13 +1,6 @@ FROM ubuntu:18.04 MAINTAINER Ventz Petkov -# 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: VOLUME /var/lib/mysql #VOLUME /var/www/MISP/Config @@ -29,6 +22,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/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" ; \ RUN sed -i -E 's/^(\s*)system\(\);/\1unix-stream("\/dev\/log");/' /etc/syslog-ng/syslog-ng.conf ; \ postconf -e "relayhost = $POSTFIX_RELAY_HOST" ; \ @@ -78,6 +73,8 @@ RUN sudo -H git checkout ; \ sudo pip3 install -I . #RUN sudo pip uninstall -y cybox +ARG MISP_FQDN=localhost +ARG MISP_EMAIL=admin@localhost WORKDIR /var/www/MISP/app RUN mkdir /var/www/.composer && chown -R www-data:www-data /var/www/.composer ; \ @@ -124,6 +121,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/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 ; \ 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 ; \