diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..b49f8eb --- /dev/null +++ b/.dockerignore @@ -0,0 +1,23 @@ +.git +.gitea +.env.local +.env.test +docker/ +deploy/docker/docker-compose.prod.yml +deploy/docker/deploy.sh +deploy/docker/.env.example +frontend/node_modules +frontend/.nuxt +frontend/.output +var/ +LOG/ +docs/ +doc/ +tests/ +*.sql +*.xlsx +*.png +*.md +!composer.lock +!symfony.lock +!frontend/package-lock.json diff --git a/config/version.yaml b/config/version.yaml index 0f32e79..be314ae 100644 --- a/config/version.yaml +++ b/config/version.yaml @@ -1,2 +1,2 @@ parameters: - app.version: '0.1.66' + app.version: '0.1.67' diff --git a/deploy/docker/nginx.conf b/deploy/docker/nginx.conf new file mode 100644 index 0000000..dcfb549 --- /dev/null +++ b/deploy/docker/nginx.conf @@ -0,0 +1,46 @@ +server { + listen 80; + server_name _; + + root /var/www/html/frontend/.output/public; + index index.html; + + access_log /dev/stdout; + error_log /dev/stderr; + + location ^~ /api/ { + root /var/www/html/public; + try_files $uri /index.php?$query_string; + } + + location ^~ /bundles/ { + root /var/www/html/public; + try_files $uri =404; + } + + location = /api/login_check { + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME /var/www/html/public/index.php; + fastcgi_param DOCUMENT_ROOT /var/www/html/public; + fastcgi_param SCRIPT_NAME /index.php; + fastcgi_param PATH_INFO /login_check; + fastcgi_param REQUEST_URI /login_check; + fastcgi_pass 127.0.0.1:9000; + } + + location ~ ^/index\.php(/|$) { + include fastcgi_params; + fastcgi_param SCRIPT_FILENAME /var/www/html/public/index.php; + fastcgi_param DOCUMENT_ROOT /var/www/html/public; + fastcgi_pass 127.0.0.1:9000; + internal; + } + + location ~ \.php$ { + return 404; + } + + location / { + try_files $uri $uri/ /index.html; + } +} diff --git a/deploy/docker/supervisord.conf b/deploy/docker/supervisord.conf new file mode 100644 index 0000000..dafb36a --- /dev/null +++ b/deploy/docker/supervisord.conf @@ -0,0 +1,28 @@ +[supervisord] +nodaemon=true +user=root +logfile=/dev/null +logfile_maxbytes=0 +pidfile=/var/run/supervisord.pid + +[program:php-fpm] +command=php-fpm -F +autostart=true +autorestart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 +stopasgroup=true +stopsignal=QUIT + +[program:nginx] +command=nginx -g "daemon off;" +autostart=true +autorestart=true +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 +stopasgroup=true +stopsignal=QUIT