diff --git a/php/Dockerfile b/php/Dockerfile index 89e2fd9..35b65f1 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -1,9 +1,10 @@ -FROM php:7.2-fpm +FROM php:7.4-fpm RUN apt-get update && apt-get install -y \ - imagemagick \ libfreetype6-dev \ libjpeg62-turbo-dev \ + libzip-dev \ + imagemagick \ libmcrypt-dev \ libpng-dev \ libpq-dev \ @@ -13,24 +14,20 @@ RUN apt-get update && apt-get install -y \ patch \ unzip \ zlib1g-dev \ + zip \ --no-install-recommends && \ apt-get clean && rm -rf /var/lib/apt/lists/* +RUN docker-php-ext-configure gd --with-freetype --with-jpeg + RUN cp /usr/share/i18n/SUPPORTED /etc/locale.gen RUN locale-gen -RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ - RUN docker-php-ext-install \ gd \ + bcmath \ pcntl \ + pdo \ + pdo_pgsql \ pdo_mysql \ - zip - -RUN pecl channel-update pecl.php.net \ - && printf "\n" | pecl install mcrypt-1.0.2 \ - && printf "\n" | pecl install xdebug-2.7.2 \ - && docker-php-ext-enable mcrypt xdebug - -COPY conf/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini -COPY conf/zz-docker.conf /usr/local/etc/php-fpm.d/zz-docker.conf \ No newline at end of file + zip \ No newline at end of file diff --git a/php/conf/xdebug.ini b/php/conf/xdebug.ini deleted file mode 100644 index 8567ce0..0000000 --- a/php/conf/xdebug.ini +++ /dev/null @@ -1,4 +0,0 @@ -zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20170718/xdebug.so -xdebug.remote_connect_back=1 -xdebug.remote_enable=1 -xdebug.remote_port=9000 \ No newline at end of file diff --git a/php/conf/zz-docker.conf b/php/conf/zz-docker.conf deleted file mode 100644 index 63d12bf..0000000 --- a/php/conf/zz-docker.conf +++ /dev/null @@ -1,10 +0,0 @@ -[global] -daemonize = no - -[www] -listen = 9000 - -pm = dynamic -pm.max_children = 64 -pm.process_idle_timeout = 2s -pm.max_requests = 1000 \ No newline at end of file