diff --git a/Dockerfile b/Dockerfile index 9638815..e953742 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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++ @@ -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;"] \ No newline at end of file diff --git a/commands/start-nginx-ci-project.sh b/commands/start-nginx-ci-project.sh index 9abac1b..40ff735 100644 --- a/commands/start-nginx-ci-project.sh +++ b/commands/start-nginx-ci-project.sh @@ -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 \ No newline at end of file diff --git a/configs/nginx-default-site b/configs/nginx-default-site index ece57e2..b82674a 100644 --- a/configs/nginx-default-site +++ b/configs/nginx-default-site @@ -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; }