kor-elf/my-projects-website
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

Merge pull request 'Версия 0.7.1' (#11) from develop into main

Browse Source 
Reviewed-on: #11
This commit was merged in pull request #11.
This commit is contained in:
kor-elf committed 2026-10-24 01:01:17 +05:00
2 parents 5613ead566 2a7e0a1511
commit b6b62ca1dc
7 files changed
+2871 -1682
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/application/composer.lock
Generated
+990 -874
View File
File diff suppressed because it is too large. Load diff
app/application/package-lock.json
Generated
+1697 -725
View File
File diff suppressed because it is too large. Load diff
app/docker/php/conf/app-fpm.conf
+2
View File
@@ -10,6 +10,8 @@ php_admin_value[post_max_size] = ${PHP_FPM_POST_MAX_SIZE}
php_admin_value[display_errors] = ${PHP_FPM_DISPLAY_ERRORS} php_admin_value[display_errors] = ${PHP_FPM_DISPLAY_ERRORS}
php_admin_value[opcache.enable] = ${PHP_FPM_OPCACHE_ENABLE} php_admin_value[opcache.enable] = ${PHP_FPM_OPCACHE_ENABLE}
php_admin_value[opcache.validate_timestamps] = ${PHP_FPM_OPCACHE_VALIDATE_TIMESTAMPS} php_admin_value[opcache.validate_timestamps] = ${PHP_FPM_OPCACHE_VALIDATE_TIMESTAMPS}
php_admin_value[session.upload_progress.enabled] = ${PHP_FPM_SESSION_UPLOAD_PROGRESS_ENABLED}
php_admin_value[fatal_error_backtraces] = ${PHP_FPM_FATAL_ERROR_BACKTRACES}
pm = dynamic pm = dynamic
pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN} pm.max_children = ${PHP_FPM_PM_MAX_CHILDREN}
app/docker/php/start.sh
+3
View File
@@ -22,6 +22,9 @@ if [ "$role" = "app" ]; then
export PHP_FPM_PM_MAX_SPARE_SERVERS="${PHP_FPM_PM_MAX_SPARE_SERVERS:-5}" export PHP_FPM_PM_MAX_SPARE_SERVERS="${PHP_FPM_PM_MAX_SPARE_SERVERS:-5}"
export PHP_FPM_PM_MAX_REQUESTS="${PHP_FPM_PM_MAX_REQUESTS:-500}" export PHP_FPM_PM_MAX_REQUESTS="${PHP_FPM_PM_MAX_REQUESTS:-500}"
export PHP_FPM_FATAL_ERROR_BACKTRACES="${PHP_FPM_FATAL_ERROR_BACKTRACES:-0}"
export PHP_FPM_SESSION_UPLOAD_PROGRESS_ENABLED="${PHP_FPM_SESSION_UPLOAD_PROGRESS_ENABLED:-0}"
if [ "$APP_ENV" = "production" ]; then if [ "$APP_ENV" = "production" ]; then
export PHP_FPM_DISPLAY_ERRORS="${PHP_FPM_DISPLAY_ERRORS:-0}" export PHP_FPM_DISPLAY_ERRORS="${PHP_FPM_DISPLAY_ERRORS:-0}"
export PHP_FPM_OPCACHE_ENABLE="${PHP_FPM_OPCACHE_ENABLE:-1}" export PHP_FPM_OPCACHE_ENABLE="${PHP_FPM_OPCACHE_ENABLE:-1}"
docker-compose-prod.yml
+57 -25
View File
@@ -71,57 +71,89 @@ services:
volumes: volumes:
- ./redis/data:/data - ./redis/data:/data
captcha-app: captcha-web:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-web:0.9.0 # docker hub
# restart: always image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-web:0.9.0 # MDHub
cap_drop:
- ALL
cap_add:
- SETGID
- SETUID
- CHOWN
- FOWNER
depends_on:
- db
- captcha-redis
env_file: captcha-app/.env
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '"172.16.0.0/12"'
ports:
- ${DOCKER_CAPTCHA_PORT}:9000
captcha-queue:
image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- captcha-app - captcha-app
ports:
- ${DOCKER_CAPTCHA_PORT}:80
environment:
IS_GZIP: 0
# FRONTEND_PORT: ${DOCKER_CAPTCHA_PORT}
BACKEND_HOST: captcha-app
BACKEND_PORT: 9000
TRUSTED_PROXY_CIDR: 172.16.0.0/12
# Enable swagger
ENABLE_API_DOCS: 0
# SWAGGER_HOST: captcha-swagger
# SWAGGER_PORT: 8080
volumes:
- ./captcha-app/app/storage/app/public:/usr/share/nginx/html/storage
captcha-app:
# image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always
depends_on:
- db
- captcha-redis
- captcha-reverb
env_file: captcha-app/.env
environment:
CONTAINER_ROLE: app
APP_ENV: production
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-queue:
# image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always
depends_on:
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: queue CONTAINER_ROLE: queue
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-reverb: captcha-reverb:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- captcha-app
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: websockets CONTAINER_ROLE: websockets
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
ports: ports:
- ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000 - ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000
captcha-scheduler: captcha-scheduler:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- captcha-app
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: scheduler CONTAINER_ROLE: scheduler
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-redis: captcha-redis:
image: redis:3.0-alpine # docker hub image: redis:3.0-alpine # docker hub
# restart: always # restart: always
docker-compose-prod_docker-hub.yml
+66 -33
View File
@@ -1,8 +1,8 @@
#version: '3.7' #version: '3.7'
services: services:
web: web:
# image: korelf/my-projects-website-web:0.7.0 # docker hub # image: korelf/my-projects-website-web:0.7.1 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-web:0.7.0 # MDHub image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-web:0.7.1 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- app - app
@@ -17,8 +17,8 @@ services:
volumes: volumes:
- ./app/storage/app/public:/usr/share/nginx/html/storage - ./app/storage/app/public:/usr/share/nginx/html/storage
app: app:
# image: korelf/my-projects-website-app:0.7.0 # docker hub # image: korelf/my-projects-website-app:0.7.1 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.0 # MDHub image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.1 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- db - db
@@ -34,8 +34,8 @@ services:
# - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json # - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json
queue: queue:
# image: korelf/my-projects-website-app:0.7.0 # docker hub # image: korelf/my-projects-website-app:0.7.1 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.0 # MDHub image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.1 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- app - app
@@ -51,8 +51,8 @@ services:
# - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json # - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json
scheduler: scheduler:
# image: korelf/my-projects-website-app:0.7.0 # docker hub # image: korelf/my-projects-website-app:0.7.1 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.0 # MDHub image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.1 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- app - app
@@ -73,57 +73,90 @@ services:
volumes: volumes:
- ./redis/data:/data - ./redis/data:/data
captcha-app: captcha-web:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-web:0.9.0 # docker hub
# restart: always image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-web:0.9.0 # MDHub
cap_drop:
- ALL
cap_add:
- SETGID
- SETUID
- CHOWN
- FOWNER
depends_on:
- db
- captcha-redis
env_file: captcha-app/.env
ports:
- ${DOCKER_CAPTCHA_PORT}:9000
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '"172.16.0.0/12"'
captcha-queue:
image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- captcha-app - captcha-app
ports:
- ${DOCKER_CAPTCHA_PORT}:80
environment:
IS_GZIP: 0
# FRONTEND_PORT: ${DOCKER_CAPTCHA_PORT}
BACKEND_HOST: captcha-app
BACKEND_PORT: 9000
TRUSTED_PROXY_CIDR: 172.16.0.0/12
# Enable swagger
ENABLE_API_DOCS: 0
# SWAGGER_HOST: captcha-swagger
# SWAGGER_PORT: 8080
volumes:
- ./captcha-app/app/storage/app/public:/usr/share/nginx/html/storage
captcha-app:
# image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always
depends_on:
- db
- captcha-redis
- captcha-reverb
env_file: captcha-app/.env
environment:
CONTAINER_ROLE: app
APP_ENV: production
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-queue:
# image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always
depends_on:
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: queue CONTAINER_ROLE: queue
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-reverb: captcha-reverb:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- captcha-app
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: websockets CONTAINER_ROLE: websockets
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
ports: ports:
- ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000 - ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000
captcha-scheduler: captcha-scheduler:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- captcha-app
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: scheduler CONTAINER_ROLE: scheduler
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-redis: captcha-redis:
image: redis:3.0-alpine # docker hub image: redis:3.0-alpine # docker hub
# restart: always # restart: always
docker-compose.yml
+56 -25
View File
@@ -26,7 +26,7 @@ services:
depends_on: depends_on:
- db - db
- app-redis - app-redis
- captcha-app - captcha-web
volumes: volumes:
- ./app/application:/var/www/html - ./app/application:/var/www/html
environment: environment:
@@ -66,65 +66,96 @@ services:
volumes: volumes:
- ./redis/data:/data - ./redis/data:/data
captcha-app: captcha-web:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-web:0.9.0 # docker hub
cap_drop: image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-web:0.9.0 # MDHub
- ALL
cap_add:
- SETGID
- SETUID
- CHOWN
- FOWNER
depends_on:
- db
- captcha-redis
env_file: captcha-app/.env
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
ports:
- ${DOCKER_CAPTCHA_PORT}:9000
captcha-queue:
image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- captcha-app - captcha-app
ports:
- ${DOCKER_CAPTCHA_PORT}:80
environment:
IS_GZIP: 0
FRONTEND_PORT: ${DOCKER_CAPTCHA_PORT}
BACKEND_HOST: captcha-app
BACKEND_PORT: 9000
TRUSTED_PROXY_CIDR: 172.16.0.0/12
# Enable swagger
ENABLE_API_DOCS: 1
SWAGGER_HOST: captcha-swagger
SWAGGER_PORT: 8080
volumes:
- ./captcha-app/app/storage/app/public:/usr/share/nginx/html/storage
captcha-app:
# image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always
depends_on:
- db
- captcha-redis
- captcha-reverb
env_file: captcha-app/.env
environment:
CONTAINER_ROLE: app
APP_ENV: production
volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-queue:
# image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always
depends_on:
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: queue CONTAINER_ROLE: queue
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes: volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app - ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs - ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-reverb: captcha-reverb:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- captcha-app
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: websockets CONTAINER_ROLE: websockets
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes: volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app - ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs - ./captcha-app/app/storage/logs:/var/www/html/storage/logs
ports: ports:
- ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000 - ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000
captcha-scheduler: captcha-scheduler:
image: korelf/service-captcha:0.8.2 # image: korelf/service-captcha-app:0.9.0 # docker hub
image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
# restart: always # restart: always
depends_on: depends_on:
- captcha-app
- db - db
- captcha-redis - captcha-redis
environment: environment:
CONTAINER_ROLE: scheduler CONTAINER_ROLE: scheduler
APP_ENV: production
env_file: captcha-app/.env env_file: captcha-app/.env
volumes: volumes:
- ./captcha-app/app/storage/app:/var/www/html/storage/app - ./captcha-app/app/storage/app:/var/www/html/storage/app
- ./captcha-app/app/storage/logs:/var/www/html/storage/logs - ./captcha-app/app/storage/logs:/var/www/html/storage/logs
captcha-swagger:
image: swaggerapi/swagger-ui
depends_on:
- captcha-app
environment:
URLS: "[ { url: '/swagger.json', name: '/swagger.json' } ]"
BASE_URL: /api-docs
captcha-redis: captcha-redis:
image: redis:3.0-alpine # docker hub image: redis:3.0-alpine # docker hub
volumes: volumes: