Skip to content

Commit

Permalink
Merge pull request #7 from chilio/php-7.2
Browse files Browse the repository at this point in the history
Php 7.2
  • Loading branch information
chilio authored Dec 20, 2017
2 parents b94d381 + b36bd38 commit 95bee4b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ RUN sed -i'' 's/archive\.ubuntu\.com/us\.archive\.ubuntu\.com/' /etc/apt/sources
RUN apt-get update
RUN apt-get upgrade -yq
RUN apt-get install -yq libgd-tools
RUN apt-get install -yq --fix-missing php7.1-fpm php7.1-cli php7.1-xml php7.1-zip php7.1-curl php7.1-bcmath php7.1-json \
php7.1-mbstring php7.1-pgsql php7.1-mysql php7.1-mcrypt php7.1-gd php-xdebug php-imagick imagemagick nginx

RUN apt-get install -yq --fix-missing php7.2-fpm php7.2-cli php7.2-xml php7.2-zip php7.2-curl php7.2-bcmath php7.2-json \
php7.2-mbstring php7.2-pgsql php7.2-mysql php7.2-gd php-xdebug php-imagick imagemagick nginx


RUN apt-get install -yq mc lynx mysql-client bzip2 make g++

Expand Down Expand Up @@ -125,5 +127,5 @@ ARG BUILD_DATE

EXPOSE 80 9515

CMD ["php7.1-fpm", "-g", "daemon off;"]
CMD ["php7.2-fpm", "-g", "daemon off;"]
CMD ["nginx", "-g", "daemon off;"]
2 changes: 1 addition & 1 deletion commands/start-nginx-ci-project.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
sed -i "s|root /var/www/html/public;|root ${CI_PROJECT_DIR}/public;|" /etc/nginx/sites-available/default
service php7.1-fpm start
service php7.2-fpm start
service nginx start
2 changes: 1 addition & 1 deletion configs/nginx-default-site
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ server {
## With php7.0-cgi alone:
#fastcgi_pass 127.0.0.1:9000;
## With php7.0-fpm:
fastcgi_pass unix:/run/php/php7.1-fpm.sock;
fastcgi_pass unix:/run/php/php7.2-fpm.sock;
}


Expand Down

0 comments on commit 95bee4b

Please sign in to comment.