Updating docker image to use php 7.1

parent 968b8298
...@@ -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.0-fpm \ php7.1-fpm \
php7.0-cli \ php7.1-cli \
php7.0-xdebug \ php7.1-xdebug \
php7.0-pdo \ php7.1-pdo \
php7.0-pdo-mysql \ php7.1-pdo-mysql \
php7.0-sqlite3 \ php7.1-sqlite3 \
php7.0-xml \ php7.1-xml \
php7.0-mbstring \ php7.1-mbstring \
php7.0-tokenizer \ php7.1-tokenizer \
php7.0-zip \ php7.1-zip \
php7.0-mcrypt \ php7.1-mcrypt \
php7.0-gd \ php7.1-gd \
php7.0-curl \ php7.1-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 \
...@@ -36,7 +36,7 @@ RUN add-apt-repository ppa:nginx/stable \ ...@@ -36,7 +36,7 @@ RUN add-apt-repository ppa:nginx/stable \
&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \ && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp \ && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp \
&& mv /tmp/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \ && mv /tmp/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
&& printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > /etc/php/7.0/mods-available/blackfire.ini \ && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8707\n" > /etc/php/7.1/mods-available/blackfire.ini \
&& phpenmod blackfire \ && phpenmod blackfire \
&& apt-get remove -y --purge software-properties-common curl \ && apt-get remove -y --purge software-properties-common curl \
&& apt-get clean \ && apt-get clean \
...@@ -44,15 +44,15 @@ RUN add-apt-repository ppa:nginx/stable \ ...@@ -44,15 +44,15 @@ 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.ini /etc/php/7.0/fpm/php.ini COPY php.ini /etc/php/7.1/fpm/php.ini
COPY php-fpm.conf /etc/php/7.0/fpm/php-fpm.conf COPY php-fpm.conf /etc/php/7.1/fpm/php-fpm.conf
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
COPY laravel.ini /etc/php/7.0/fpm/conf.d/laravel.ini COPY laravel.ini /etc/php/7.1/fpm/conf.d/laravel.ini
#COPY disabled-xdebug.ini /etc/php/7.0/mods-available/xdebug.ini #COPY disabled-xdebug.ini /etc/php/7.1/mods-available/xdebug.ini
COPY enabled-xdebug.ini /etc/php/7.0/mods-available/xdebug.ini COPY enabled-xdebug.ini /etc/php/7.1/mods-available/xdebug.ini
RUN /etc/init.d/php7.0-fpm restart RUN /etc/init.d/php7.1-fpm restart
RUN mkdir /tmp/certgen RUN mkdir /tmp/certgen
WORKDIR /tmp/certgen WORKDIR /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.0-fpm.sock; fastcgi_pass unix:/run/php/php7.1-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.0-fpm.pid pid = /run/php/php7.1-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.0/fpm/pool.d/*.conf include=/etc/php/7.1/fpm/pool.d/*.conf
...@@ -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.0 command=php-fpm7.1
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