Hasan/eatvio-infra
1
0
Fork 0
forked from eatvio/eatvio-infra
Code Pull Requests Activity

fix conflicts

Browse Source
This commit is contained in:
HasanKulbuzhev
2025-12-24 13:08:08 +03:00
parent d8a5f232da 5dfb903a93
commit fe70c85951
7 changed files with 119 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
phpdocker/front-end/Dockerfile
View File

@@ -1,15 +1,15 @@
FROM phpdockerio/php:8.3-fpm
FROM phpdockerio/php:8.4-fpm
WORKDIR "/application"
RUN curl -sL https://deb.nodesource.com/setup_22.x | bash -
RUN curl -sL https://deb.nodesource.com/setup_24.x | bash -
RUN apt-get update && \
apt-get -y --no-install-recommends install \
git \
php8.3-gd \
php8.3-mysql \
php8.3-sqlite3 \
php8.3-pgsql \
nodejs && npm install -g npm@10.1.0 \
php8.4-gd \
php8.4-mysql \
php8.4-sqlite3 \
php8.4-pgsql \
nodejs && npm install -g npm@latest \
apt-get clean; \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

124
phpdocker/nginx/nginx.conf
View File

@@ -2,29 +2,62 @@ upstream phpupstream {
server php-fpm:9000 fail_timeout=5s max_fails=5;
}
resolver 127.0.0.11 ipv6=off;
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
server {
listen 80;
server_name hasan.eatvio.local;
server_name my-dev.eatvio.test; # change me
client_max_body_size 108M;
rewrite_log on;
# access_log /var/log/nginx/application.access.log;
access_log /dev/stdout;
error_log /dev/stdout info;
root /application/public;
index index.php;
# Vite HMR WebSocket and assets
location /_vite {
proxy_pass http://frontend:5173;
proxy_http_version 1.1;
# WebSocket support
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;
# Headers
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host;
# Timeouts
proxy_connect_timeout 7d;
proxy_send_timeout 7d;
proxy_read_timeout 7d;
}
# Production build assets
location /build {
try_files $uri $uri/ =404;
expires 1y;
add_header Cache-Control "public, immutable";
}
# try to serve file directly, fallback to index.php
location / {
try_files $uri /index.php$is_args$args;
}
if (!-e $request_filename) {
rewrite ^.*$ /index.php last;
}
location ~ \.php$ {
#resolver 127.0.0.11;
#set $upstream php-fpm:9000;
@@ -39,87 +72,10 @@ server {
include fastcgi_params;
}
}
server {
listen 5000 ssl;
server_name localhost;
ssl_certificate /etc/nginx/hasan.eatvio.local+4.pem;
ssl_certificate_key /etc/nginx/hasan.eatvio.local+4-key.pem;
ssl_protocols TLSv1.2;
rewrite_log on;
error_log /dev/stdout debug;
charset UTF-8;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Host $server_name;
add_header X-Frame-Options "SAMEORIGIN" always;
add_header X-Content-Type-Options "nosniff" always;
add_header Referrer-Policy "strict-origin-when-cross-origin" always;
# add_header Content-Security-Policy "default-src 'self';";
server_tokens off;
client_max_body_size 100M;
root /application/public;
index index.php;
# location ^~ /visualization/ {
# rewrite /visualization/(.*) /$1 break;
# proxy_pass http://imageproxy:8080;
# }
# try to serve file directly, fallback to index.php
location / {
try_files $uri /index.php$is_args$args;
}
# if (!-e $request_filename) {
# rewrite ^.*$ /index.php last;
# }
location ~ \.php$ {
fastcgi_pass phpupstream;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PHP_VALUE "error_log=/var/log/nginx/application_php_errors.log";
fastcgi_buffers 16 16k;
fastcgi_buffer_size 32k;
include fastcgi_params;
}
}
server {
listen 5000 ssl;
server_name socket.hasan.eatvio.local;
ssl_certificate /etc/nginx/hasan.eatvio.local+4.pem;
ssl_certificate_key /etc/nginx/hasan.eatvio.local+4-key.pem;
ssl_protocols TLSv1.2;
location / {
proxy_pass http://soketi:6001;
proxy_read_timeout 60;
proxy_connect_timeout 60;
proxy_redirect off;
# Allow the use of websockets
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade';
proxy_set_header Host $host;
proxy_cache_bypass $http_upgrade;
}
error_log /dev/stdout info;
access_log /dev/stdout;
}
server {
listen 80;
server_name socket.hasan.eatvio.local;
server_name ws-my-dev.eatvio.test; # change me
location / {
proxy_pass http://soketi:6001;

22
phpdocker/php-fpm/Dockerfile
View File

@@ -1,20 +1,20 @@
FROM phpdockerio/php:8.3-fpm
FROM phpdockerio/php:8.4-fpm
WORKDIR "/application"
RUN curl -sL https://deb.nodesource.com/setup_22.x | bash -
RUN curl -sL https://deb.nodesource.com/setup_24.x | bash -
RUN apt-get update && \
apt-get -y --no-install-recommends install \
git \
imagemagick php8.3-imagick \
php8.3-gd \
php8.3-mysql \
php8.3-sqlite3 \
php8.3-intl \
php8.3-memcached \
php8.3-pgsql \
php8.3-xdebug \
imagemagick php8.4-imagick \
php8.4-gd \
php8.4-mysql \
php8.4-sqlite3 \
php8.4-intl \
php8.4-memcached \
php8.4-pgsql \
php8.4-xdebug \
python3-pkg-resources supervisor ffmpeg jpegoptim \
nodejs && npm install -g npm@10.1.0 \
nodejs && npm install -g npm@latest \
apt-get clean; \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*

10
phpdocker/worker/Dockerfile
View File

@@ -1,12 +1,12 @@
FROM phpdockerio/php:8.3-fpm
FROM phpdockerio/php:8.4-fpm
WORKDIR "/application"
RUN apt-get update && \
apt-get -y --no-install-recommends install git \
php8.3-gd php8.3-mysql php8.3-sqlite3 php8.3-pgsql ffmpeg jpegoptim \
php8.3-intl \
php8.3-memcached \
imagemagick php8.3-imagick \
php8.4-gd php8.4-mysql php8.4-sqlite3 php8.4-pgsql ffmpeg jpegoptim \
php8.4-intl \
php8.4-memcached \
imagemagick php8.4-imagick \
python3-pkg-resources supervisor && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*