diff --git a/Dockerfile b/Dockerfile index 41d2366..6edd99c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,6 +24,7 @@ RUN apt update && apt install -y \ libonig-dev \ libxslt1-dev \ acl \ + nginx \ && echo 'alias sf="php bin/console"' >> ~/.bashrc RUN wget -q -O /etc/apt/trusted.gpg.d/lab50.gpg http://packages.lab50.net/lab50.gpg @@ -63,17 +64,19 @@ WORKDIR /usr/src/signer/ COPY ./backend /usr/src/signer COPY ./docker/php/www.conf /etc/php/8.3/fpm/pool.d/www.conf - -RUN curl curl https://frankenphp.dev/install.sh | sh -RUN mv /usr/src/signer/frankenphp /usr/local/bin/ +COPY ./docker/nginx/default.conf /etc/nginx/sites-enabled/default +COPY ./docker/nginx/nginx.conf /etc/nginx/nginx.conf +RUN mkdir -p /run/php +# RUN curl curl https://frankenphp.dev/install.sh | sh +# RUN mv /usr/src/signer/frankenphp /usr/local/bin/ ENV COMPOSER_ALLOW_SUPERUSER=1 RUN composer install -RUN service php8.3-fpm start +# RUN service php8.3-fpm start COPY entrypoint.sh /entrypoint.sh ENTRYPOINT [ "/entrypoint.sh" ] -CMD ["php-fpm8.3", "-F"] +# CMD ["php-fpm8.3", "-F", "nginx", "-g 'daemon off'"] EXPOSE 9000 \ No newline at end of file diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index 8cf0e9a..221860f 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -1,6 +1,21 @@ server { server_name _; listen *:80; + index index.php index.html index.htm; + root /usr/src/signer/public; - root /application/public; -} + + location ~* \.php$ { + try_files $uri $uri/ /index.php last; + fastcgi_split_path_info (.+?\.php)(/.*)$; + fastcgi_pass localhost:9000; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param PATH_INFO $fastcgi_path_info; + } + + location ~* .php/ { + rewrite (.*.php)/ $1 last; + } +} \ No newline at end of file diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index 2c6a3f8..704f46a 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -1,9 +1,10 @@ user www-data; worker_processes 4; +daemon off; pid /run/nginx.pid; events { - worker_connections 2048; + worker_connections 2048; multi_accept on; use epoll; } @@ -34,4 +35,3 @@ http { fastcgi_buffer_size 32k; } -daemon off;