Use minimum php version by default

parent d6dca69e
...@@ -16,19 +16,19 @@ RUN add-apt-repository ppa:nginx/stable \ ...@@ -16,19 +16,19 @@ RUN add-apt-repository ppa:nginx/stable \
&& apt-get update \ && apt-get update \
&& apt-get install --no-install-recommends -y \ && apt-get install --no-install-recommends -y \
nginx \ nginx \
php7.1-fpm \ php7.0-fpm \
php7.1-cli \ php7.0-cli \
php7.1-xdebug \ php7.0-xdebug \
php7.1-pdo \ php7.0-pdo \
php7.1-pdo-mysql \ php7.0-pdo-mysql \
php7.1-sqlite3 \ php7.0-sqlite3 \
php7.1-xml \ php7.0-xml \
php7.1-mbstring \ php7.0-mbstring \
php7.1-tokenizer \ php7.0-tokenizer \
php7.1-zip \ php7.0-zip \
php7.1-mcrypt \ php7.0-mcrypt \
php7.1-gd \ php7.0-gd \
php7.1-curl \ php7.0-curl \
curl \ curl \
&& mkdir /run/php \ && mkdir /run/php \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
...@@ -38,7 +38,7 @@ RUN add-apt-repository ppa:nginx/stable \ ...@@ -38,7 +38,7 @@ RUN add-apt-repository ppa:nginx/stable \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
COPY default /etc/nginx/sites-enabled/default COPY default /etc/nginx/sites-enabled/default
COPY php-fpm.conf /etc/php/7.1/fpm/php-fpm.conf COPY php-fpm.conf /etc/php/7.0/fpm/php-fpm.conf
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
RUN mkdir /tmp/certgen RUN mkdir /tmp/certgen
......
...@@ -25,7 +25,7 @@ server { ...@@ -25,7 +25,7 @@ server {
} }
location ~ \.php$ { location ~ \.php$ {
include snippets/fastcgi-php.conf; include snippets/fastcgi-php.conf;
fastcgi_pass unix:/run/php/php7.1-fpm.sock; fastcgi_pass unix:/run/php/php7.0-fpm.sock;
} }
location ~ /\.ht { location ~ /\.ht {
deny all; deny all;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
; Pid file ; Pid file
; Note: the default prefix is /var ; Note: the default prefix is /var
; Default Value: none ; Default Value: none
pid = /run/php/php7.1-fpm.pid pid = /run/php/php7.0-fpm.pid
; Error log file ; Error log file
; If it's set to "syslog", log is sent to syslogd instead of being written ; If it's set to "syslog", log is sent to syslogd instead of being written
...@@ -122,4 +122,4 @@ daemonize = no ...@@ -122,4 +122,4 @@ daemonize = no
; Relative path can also be used. They will be prefixed by: ; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument) ; - the global prefix if it's been set (-p argument)
; - /usr otherwise ; - /usr otherwise
include=/etc/php/7.1/fpm/pool.d/*.conf include=/etc/php/7.0/fpm/pool.d/*.conf
\ No newline at end of file
...@@ -9,7 +9,7 @@ stderr_logfile=/dev/stderr ...@@ -9,7 +9,7 @@ stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
[program:php-fpm] [program:php-fpm]
command=php-fpm7.1 command=php-fpm7.0
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment