diff --git a/docker/Dockerfile b/docker/Dockerfile index adb7731..2ebb4c9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,13 +1,13 @@ FROM alpine:3 RUN apk add --no-cache apache2 php7 php7-apache2 php7-mysqli php7-mbstring php7-pcntl php7-intl php7-json php7-session mariadb mariadb-client git rsync msmtp COPY files/my.cnf /etc/my.cnf -COPY files/httpd.conf /etc/apache2/httpd.conf -COPY files/php.ini /etc/php7/php.ini -COPY files/msmtprc /etc/php7/msmtprc -COPY files/binit.sh /usr/local/bin/binit.sh -COPY files/update.sh /root/update.sh -COPY files/mastostart_popolato.sql.gz /root/mastostart_popolato.sql.gz -COPY files/create_user.sql /root/create_user.sql -COPY files/install.sh /root/install.sh +COPY files/httpd.conf /etc/apache2/ +COPY files/php.ini /etc/php7/ +COPY files/msmtprc /etc/php7/ +COPY files/binit.sh /usr/local/bin/ +COPY files/update.sh /root/ +COPY files/mastostart_popolato.sql.xz /root/ +COPY files/create_user.sql /root/ +COPY files/install.sh /root/ RUN /root/install.sh CMD /usr/local/bin/binit.sh diff --git a/docker/files/install.sh b/docker/files/install.sh index 3088713..a8d99f3 100755 --- a/docker/files/install.sh +++ b/docker/files/install.sh @@ -8,7 +8,7 @@ mysqld_safe & sleep 5 -gzip -d mastostart_popolato.sql.gz +xz -d mastostart_popolato.sql.xz mysql -e 'source mastostart_popolato.sql' diff --git a/docker/files/mastostart_popolato.sql.gz b/docker/files/mastostart_popolato.sql.gz deleted file mode 100644 index 90bce93..0000000 Binary files a/docker/files/mastostart_popolato.sql.gz and /dev/null differ diff --git a/docker/files/mastostart_popolato.sql.xz b/docker/files/mastostart_popolato.sql.xz new file mode 100644 index 0000000..2b3ba51 Binary files /dev/null and b/docker/files/mastostart_popolato.sql.xz differ diff --git a/docker/files/php.ini b/docker/files/php.ini index adf6999..c68aaba 100644 --- a/docker/files/php.ini +++ b/docker/files/php.ini @@ -398,7 +398,7 @@ max_input_time = 60 ; Maximum amount of memory a script may consume (128MB) ; http://php.net/memory-limit -memory_limit = 8G +memory_limit = 2G ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Error handling and logging ;