Kevin 3 years ago
parent
commit
832ad9b5de
3 changed files with 8 additions and 9 deletions
  1. 0 2
      .env
  2. 2 0
      .gitignore
  3. 6 7
      Docker/php-fpm/Dockerfile

+ 0 - 2
.env

@@ -1,7 +1,5 @@
 TZ=Europe/Paris
 
-PHP_VERSION=php:7.4.6-fpm
-
 MYSQL_VERSION=mariadb
 MYSQL_ROOT_PASSWORD=root
 

+ 2 - 0
.gitignore

@@ -1 +1,3 @@
 log/nginx/*
+wwwroot/html/*
+wwwroot/html/.*

+ 6 - 7
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