Merge pull request lbanchio#10 from lbanchio/[email protected]

Add PHP 8 @ 18.04
lubatti · Dec 17, 2020 · fc5dfdb · fc5dfdb
2 parents bcba03a + d4aea10
commit fc5dfdb
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -17,24 +17,24 @@ RUN locale-gen en_US.UTF-8 && \
     apt-get update && \
     apt-get upgrade -y && \
     apt-get install -y --force-yes nginx \
-    php7.4-fpm \
-    php7.4-zip \
-    php7.4-mysql \
-    php7.4-redis \
-    php7.4-xml \
-    php7.4-xdebug \
-    php7.4-common \
-    php7.4-sqlite \
-    php7.4-curl \
-    php7.4-zmq \
-    php7.4-gd \
-    php7.4-imagick \
-    php7.4-soap \
-    php7.4-apcu \
-    php7.4-mbstring \
-    php7.4-intl \
-    php7.4-bcmath \
-    php7.4-mongodb \
+    php8.0-fpm \
+    php8.0-zip \
+    php8.0-mysql \
+    php8.0-redis \
+    php8.0-xml \
+    php8.0-xdebug \
+    php8.0-common \
+    php8.0-sqlite \
+    php8.0-curl \
+    php8.0-zmq \
+    php8.0-gd \
+    php8.0-imagick \
+    php8.0-soap \
+    php8.0-apcu \
+    php8.0-mbstring \
+    php8.0-intl \
+    php8.0-bcmath \
+    php8.0-mongodb \
     unzip \
     git && \
     apt-get clean && \
@@ -49,32 +49,32 @@ RUN groupadd -g 1000 user && useradd --no-log-init -u 1000 -b /var/www -M -g use
 RUN echo "daemon off;" >>                                               /etc/nginx/nginx.conf
 RUN sed -i "s/sendfile on/sendfile off/"                                /etc/nginx/nginx.conf
 RUN sed -i "s/user www-data/user user/"                                 /etc/nginx/nginx.conf
-RUN sed -i "s/user = www-data/user = user/"                             /etc/php/7.4/fpm/pool.d/www.conf
-RUN sed -i "s/group = www-data/group = user/"                           /etc/php/7.4/fpm/pool.d/www.conf
-RUN sed -i "s/listener.owner = www-data/listener.owner = user/"         /etc/php/7.4/fpm/pool.d/www.conf
-RUN sed -i "s/listener.group = www-data/listener.group = user/"         /etc/php/7.4/fpm/pool.d/www.conf
+RUN sed -i "s/user = www-data/user = user/"                             /etc/php/8.0/fpm/pool.d/www.conf
+RUN sed -i "s/group = www-data/group = user/"                           /etc/php/8.0/fpm/pool.d/www.conf
+RUN sed -i "s/listener.owner = www-data/listener.owner = user/"         /etc/php/8.0/fpm/pool.d/www.conf
+RUN sed -i "s/listener.group = www-data/listener.group = user/"         /etc/php/8.0/fpm/pool.d/www.conf
 RUN mkdir -p                                                            /var/www
 RUN mkdir -p                                                            /run/php
 RUN mkdir -m 777                                                        /tmp/php
 
 # Configure PHP
-RUN sed -i "s/;session.save_path =.*/session.save_path = \/tmp\/php/"   /etc/php/7.4/fpm/php.ini
-RUN sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/"                  /etc/php/7.4/fpm/php.ini
-RUN sed -i "s/;date.timezone =.*/date.timezone = Asia\/Kolkata/"        /etc/php/7.4/fpm/php.ini
-RUN sed -i "s/variables_order =.*/variables_order = \"EGPCS\"/"         /etc/php/7.4/fpm/php.ini
-RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g"                 /etc/php/7.4/fpm/php-fpm.conf
-RUN sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/"                  /etc/php/7.4/cli/php.ini
-RUN sed -i "s/;date.timezone =.*/date.timezone = Asia\/Kolkata/"        /etc/php/7.4/cli/php.ini
-RUN sed -i "s/;clear_env =.*/clear_env = no/"                           /etc/php/7.4/fpm/pool.d/www.conf      /etc/php/7.4/cli/php.ini
+RUN sed -i "s/;session.save_path =.*/session.save_path = \/tmp\/php/"   /etc/php/8.0/fpm/php.ini
+RUN sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/"                  /etc/php/8.0/fpm/php.ini
+RUN sed -i "s/;date.timezone =.*/date.timezone = Asia\/Kolkata/"        /etc/php/8.0/fpm/php.ini
+RUN sed -i "s/variables_order =.*/variables_order = \"EGPCS\"/"         /etc/php/8.0/fpm/php.ini
+RUN sed -i -e "s/;daemonize\s*=\s*yes/daemonize = no/g"                 /etc/php/8.0/fpm/php-fpm.conf
+RUN sed -i "s/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/"                  /etc/php/8.0/cli/php.ini
+RUN sed -i "s/;date.timezone =.*/date.timezone = Asia\/Kolkata/"        /etc/php/8.0/cli/php.ini
+RUN sed -i "s/;clear_env =.*/clear_env = no/"                           /etc/php/8.0/fpm/pool.d/www.conf      /etc/php/8.0/cli/php.ini
 
-RUN echo "xdebug.idekey=phpstorm" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
-RUN echo "xdebug.remote_enable=1" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
-RUN echo "xdebug.remote_port=9000" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
-RUN echo "xdebug.remote_connect_back=1" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
-RUN echo "xdebug.max_nesting_level=600" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
-RUN echo "xdebug.scream=0" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
-RUN echo "xdebug.cli_color=1" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
-RUN echo "xdebug.show_local_vars=1" >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.idekey=phpstorm" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.remote_enable=1" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.remote_port=9000" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.remote_connect_back=1" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.max_nesting_level=600" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.scream=0" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.cli_color=1" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
+RUN echo "xdebug.show_local_vars=1" >> /etc/php/8.0/fpm/conf.d/20-xdebug.ini
 
 RUN phpenmod xdebug
 

diff --git a/build/php/run.sh b/build/php/run.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-php-fpm7.4 -c /etc/php/7.4/fpm
+php-fpm8.0 -c /etc/php/8.0/fpm