Refactored production Docker Compose file: added web and captcha-web services, updated captcha services configuration, switched images to MDHub, and adjusted environment variables.

docker-compose-prod.yml

@@ -1,31 +1,49 @@
-version: '3.7'
+#version: '3.7'
 services:
+  web:
+    build:
+      context: app
+      dockerfile: docker/Dockerfile
+      target: WEB_PRODUCTION
+      #  restart: always
+    depends_on:
+      - app
+    ports:
+      - ${DOCKER_WEB_PORT}:80
+    environment:
+      IS_GZIP: 1
+      # FRONTEND_PORT: ${DOCKER_WEB_PORT}
+      BACKEND_HOST: app
+      BACKEND_PORT: 9000
+      TRUSTED_PROXY_CIDR: 172.16.0.0/12
+    volumes:
+      - ./app/application/public:/usr/share/nginx/html
+      - ./app/application/storage/app/public:/usr/share/nginx/html/storage
   app:
     build:
       context: app
       dockerfile: docker/Dockerfile
-      target: PRODUCTION
+      target: APP_PRODUCTION
     #  restart: always
     depends_on:
       - db
       - app-redis
       - captcha-app
-    ports:
-      - ${DOCKER_APP_PORT}:9000
-    environment:
-      CONTAINER_ROLE: app
-      UNIT_SOURCE: '"172.16.0.0/12"'
     volumes:
       - ./app/application:/var/www/html
       - ./certs:/var/www/html/resources/certs:ro
+    environment:
+      CONTAINER_ROLE: app
+      APP_ENV: production
 
   queue:
     build:
       context: app
       dockerfile: docker/Dockerfile
-      target: PRODUCTION
+      target: APP_PRODUCTION
     #  restart: always
     depends_on:
+      - app
       - db
       - app-redis
     environment:
@@ -33,13 +51,15 @@ services:
     volumes:
       - ./app/application:/var/www/html
       - ./certs:/var/www/html/resources/certs:ro
+
   scheduler:
     build:
       context: app
       dockerfile: docker/Dockerfile
-      target: PRODUCTION
+      target: APP_PRODUCTION
     #  restart: always
     depends_on:
+      - app
       - db
       - app-redis
     environment:
@@ -66,56 +86,85 @@ services:
     volumes:
       - ./db/data:/var/lib/mysql
 
+  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:0.8.2
+    #    image: korelf/service-captcha-app:0.9.0 # docker hub
-    cap_drop:
+    image: docker.mdhub.kor-elf.net/kor-elf/service-captcha-app:0.9.0 # MDHub
-      - ALL
+    #  restart: always
-    cap_add:
-      - SETGID
-      - SETUID
-      - CHOWN
-      - FOWNER
     depends_on:
       - db
       - captcha-redis
+      - captcha-reverb
     env_file: captcha-app/.env
-    #  restart: always
+    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
-    ports:
+
-      - ${DOCKER_CAPTCHA_PORT}:9000
   captcha-queue:
-    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:
       - 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:
       - 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:
       - 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