diff --git a/Dockerfile b/Dockerfile index 11ac3863a..d8b905da8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,12 @@ -FROM nginx +FROM phpdockerio/php74-fpm # install php fpm RUN apt-get update \ - && apt-get -y --no-install-recommends install curl unzip php7.3-curl php7.3-fpm php7.3-mbstring php7.3-intl php7.3-xml php7.3-pdo php7.3-mysql \ + && apt-get -y --no-install-recommends install curl unzip php7.4-curl php7.4-fpm php7.4-mbstring php7.4-intl php7.4-xml php7.4-pdo php7.4-mysql \ && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* - -# install composer -COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer -WORKDIR /usr/share/nginx/html +WORKDIR /var/www/cakephp -COPY . . -COPY ./config/nginx/nginx.conf /etc/nginx/conf.d/default.conf -COPY ./config/nginx/fastcgi.conf /etc/nginx/ -COPY ./config/nginx/mime.types /etc/nginx/ -RUN composer update --no-scripts --no-autoloader \ No newline at end of file +COPY ./community_server/ . +COPY ./configs/community_server/app.php ./config/ +RUN composer update diff --git a/config/nginx/nginx.conf b/config/nginx/nginx.conf index 8cba3fd5d..5aa5c3095 100644 --- a/config/nginx/nginx.conf +++ b/config/nginx/nginx.conf @@ -37,8 +37,8 @@ server { fastcgi_index index.php; include fastcgi.conf; - fastcgi_pass unix:/run/php/php7.3-fpm.sock; - #fastcgi_pass 127.0.0.1:9000; + #fastcgi_pass unix:/run/php/php7.3-fpm.sock; + fastcgi_pass 127.0.0.1:9000; }