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

Reviewed-on: #11

app/docker/php/conf/app-fpm.conf

@@ -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[opcache.enable] = ${PHP_FPM_OPCACHE_ENABLE}
 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.max_children = ${PHP_FPM_PM_MAX_CHILDREN}

app/docker/php/start.sh

@@ -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_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
     export PHP_FPM_DISPLAY_ERRORS="${PHP_FPM_DISPLAY_ERRORS:-0}"
     export PHP_FPM_OPCACHE_ENABLE="${PHP_FPM_OPCACHE_ENABLE:-1}"

docker-compose-prod.yml

@@ -71,57 +71,89 @@ services:
     volumes:
       - ./redis/data:/data
 
-  captcha-app:
-    image: korelf/service-captcha:0.8.2
-    #  restart: always
-    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
+  captcha-web:
+    #  image: korelf/service-captcha-web:0.9.0 # docker hub
+    image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-web:0.9.0 # MDHub
     #  restart: always
     depends_on:
       - 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
       - captcha-redis
     environment:
       CONTAINER_ROLE: queue
+      APP_ENV: production
     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:
-    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
     depends_on:
-      - captcha-app
       - db
       - captcha-redis
     environment:
       CONTAINER_ROLE: websockets
+      APP_ENV: production
     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_WEBSOCKET_PORT}:9000
+
   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
     depends_on:
-      - captcha-app
       - db
       - captcha-redis
     environment:
       CONTAINER_ROLE: scheduler
+      APP_ENV: production
     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:
     image: redis:3.0-alpine # docker hub
     #  restart: always

docker-compose-prod_docker-hub.yml

@@ -1,8 +1,8 @@
 #version: '3.7'
 services:
   web:
-    #  image: korelf/my-projects-website-web:0.7.0 # docker hub
-    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-web:0.7.0 # MDHub
+    #  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.1 # MDHub
     #  restart: always
     depends_on:
       - app
@@ -17,8 +17,8 @@ services:
     volumes:
       - ./app/storage/app/public:/usr/share/nginx/html/storage
   app:
-    #  image: korelf/my-projects-website-app:0.7.0 # docker hub
-    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.0 # MDHub
+    #  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.1 # MDHub
     #  restart: always
     depends_on:
       - db
@@ -34,8 +34,8 @@ services:
       # - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json
 
   queue:
-    #  image: korelf/my-projects-website-app:0.7.0 # docker hub
-    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.0 # MDHub
+    #  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.1 # MDHub
     #  restart: always
     depends_on:
       - app
@@ -51,8 +51,8 @@ services:
       # - ./app/translate/authorized_key.json:/var/www/html/storage/translation_service/authorized_key.json
 
   scheduler:
-    #  image: korelf/my-projects-website-app:0.7.0 # docker hub
-    image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website-app:0.7.0 # MDHub
+    #  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.1 # MDHub
     #  restart: always
     depends_on:
       - app
@@ -73,57 +73,90 @@ services:
     volumes:
       - ./redis/data:/data
 
-  captcha-app:
-    image: korelf/service-captcha:0.8.2
-    #  restart: always
-    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
+  captcha-web:
+    #  image: korelf/service-captcha-web:0.9.0 # docker hub
+    image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-web:0.9.0 # MDHub
     #  restart: always
     depends_on:
       - 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
       - captcha-redis
     environment:
       CONTAINER_ROLE: queue
+      APP_ENV: production
     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:
-    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
     depends_on:
-      - captcha-app
       - db
       - captcha-redis
     environment:
       CONTAINER_ROLE: websockets
+      APP_ENV: production
     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_WEBSOCKET_PORT}:9000
+
   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
     depends_on:
-      - captcha-app
       - db
       - captcha-redis
     environment:
       CONTAINER_ROLE: scheduler
+      APP_ENV: production
     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:
     image: redis:3.0-alpine # docker hub
     #  restart: always

docker-compose.yml

@@ -26,7 +26,7 @@ services:
     depends_on:
       - db
       - app-redis
-      - captcha-app
+      - captcha-web
     volumes:
       - ./app/application:/var/www/html
     environment:
@@ -66,65 +66,96 @@ services:
     volumes:
       - ./redis/data:/data
 
-  captcha-app:
-    image: korelf/service-captcha:0.8.2
-    cap_drop:
-      - 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
+  captcha-web:
+    #  image: korelf/service-captcha-web:0.9.0 # docker hub
+    image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-web:0.9.0 # MDHub
     #  restart: always
     depends_on:
       - 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
       - captcha-redis
     environment:
       CONTAINER_ROLE: queue
+      APP_ENV: production
     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:
-    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
     depends_on:
-      - captcha-app
       - db
       - captcha-redis
     environment:
       CONTAINER_ROLE: websockets
+      APP_ENV: production
     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_WEBSOCKET_PORT}:9000
+
   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
     depends_on:
-      - captcha-app
       - db
       - captcha-redis
     environment:
       CONTAINER_ROLE: scheduler
+      APP_ENV: production
     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-swagger:
+    image: swaggerapi/swagger-ui
+    depends_on:
+      - captcha-app
+    environment:
+      URLS: "[ { url: '/swagger.json', name: '/swagger.json' } ]"
+      BASE_URL: /api-docs
   captcha-redis:
     image: redis:3.0-alpine # docker hub
     volumes: