diff --git a/.env b/.env index 132b3f2..81957a8 100644 --- a/.env +++ b/.env @@ -1,7 +1,5 @@ TZ=Europe/Paris -PHP_VERSION=php:7.4.6-fpm - MYSQL_VERSION=mariadb MYSQL_ROOT_PASSWORD=root diff --git a/.gitignore b/.gitignore index c47ff25..d09a832 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ log/nginx/* +wwwroot/html/* +wwwroot/html/.* diff --git a/Docker/php-fpm/Dockerfile b/Docker/php-fpm/Dockerfile index 39b38b8..d5b3ec1 100644 --- a/Docker/php-fpm/Dockerfile +++ b/Docker/php-fpm/Dockerfile @@ -1,9 +1,4 @@ -FROM php:7.4.6 - -RUN touch /usr/local/etc/php/conf.d/php.ini \ - && echo "upload_max_filesize = 10M;" >> /usr/local/etc/php/conf.d/php.ini \ - && echo "memory_limit = 2G;" >> /usr/local/etc/php/conf.d/php.ini - +FROM php:7.4-fpm RUN apt-get update && apt-get install -y \ libfreetype6-dev \ @@ -22,7 +17,7 @@ RUN apt-get update && apt-get install -y \ docker-php-ext-install opcache && \ docker-php-ext-install bcmath && \ apt-get install -y git vim && \ - pecl install redis-4.3.0 && \ + pecl install redis && \ pecl install xdebug && \ docker-php-ext-enable xdebug redis mysqli @@ -42,3 +37,7 @@ RUN apt-get install -y curl && \ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ apt-get update && \ apt-get install -y nodejs yarn + +RUN touch /usr/local/etc/php/conf.d/php.ini \ + && echo "upload_max_filesize = 10M;" >> /usr/local/etc/php/conf.d/php.ini \ + && echo "memory_limit = 2G;" >> /usr/local/etc/php/conf.d/php.ini