diff --git a/app/application/.env.example b/app/application/.env.example index 0f7ae55..61089d6 100644 --- a/app/application/.env.example +++ b/app/application/.env.example @@ -11,7 +11,6 @@ CAPTCHA_STATIC_PATH=http://your-domain-captcha-or-IP:8081/captcha CAPTCHA_PUBLIC_TOKEN= APP_FORCE_HTTPS=false -#UNIT_SOURCE="\"172.16.0.0/12\"" APP_DEFAULT_LOCALE=ru APP_FAKER_LOCALE=ru_RU diff --git a/captcha-app/redis/.gitignore b/captcha-app/redis/.gitignore new file mode 100644 index 0000000..adbb97d --- /dev/null +++ b/captcha-app/redis/.gitignore @@ -0,0 +1 @@ +data/ \ No newline at end of file diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 05ef617..d24169c 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -14,12 +14,17 @@ services: - ${DOCKER_APP_PORT}:9000 volumes: - ./app/application:/var/www/html + environment: + CONTAINER_ROLE: app + UNIT_SOURCE: '["172.16.0.0/12"]' app-redis: image: redis:3.0-alpine # restart: always + volumes: + - ./redis/data:/data captcha-app: - image: korelf/service-captcha:0.8.1 + image: korelf/service-captcha:0.8.2 # restart: always cap_drop: - ALL @@ -32,10 +37,13 @@ services: - 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.1 + image: korelf/service-captcha:0.8.2 # restart: always depends_on: - db @@ -44,7 +52,7 @@ services: CONTAINER_ROLE: queue env_file: captcha-app/.env captcha-reverb: - image: korelf/service-captcha:0.8.1 + image: korelf/service-captcha:0.8.2 # restart: always depends_on: - db @@ -55,7 +63,7 @@ services: ports: - ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000 captcha-scheduler: - image: korelf/service-captcha:0.8.1 + image: korelf/service-captcha:0.8.2 # restart: always depends_on: - db @@ -66,6 +74,8 @@ services: captcha-redis: image: redis:3.0-alpine # restart: always + volumes: + - ./captcha-app/redis/data:/data db: image: docker.io/mysql:8.0.33 command: --default-authentication-plugin=mysql_native_password diff --git a/docker-compose-prod_docker-hub.yml b/docker-compose-prod_docker-hub.yml index 8f9f639..a1239d2 100644 --- a/docker-compose-prod_docker-hub.yml +++ b/docker-compose-prod_docker-hub.yml @@ -10,15 +10,20 @@ services: ports: - ${DOCKER_APP_PORT}:9000 env_file: app/.env + environment: + CONTAINER_ROLE: app + UNIT_SOURCE: '["172.16.0.0/12"]' volumes: - ./app/storage/app:/var/www/html/storage/app - ./app/storage/logs:/var/www/html/storage/logs app-redis: image: redis:3.0-alpine # restart: always + volumes: + - ./redis/data:/data captcha-app: - image: korelf/service-captcha:0.8.1 + image: korelf/service-captcha:0.8.2 # restart: always cap_drop: - ALL @@ -33,8 +38,11 @@ services: 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.1 + image: korelf/service-captcha:0.8.2 # restart: always depends_on: - db @@ -43,7 +51,7 @@ services: CONTAINER_ROLE: queue env_file: captcha-app/.env captcha-reverb: - image: korelf/service-captcha:0.8.1 + image: korelf/service-captcha:0.8.2 # restart: always depends_on: - db @@ -54,7 +62,7 @@ services: ports: - ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000 captcha-scheduler: - image: korelf/service-captcha:0.8.1 + image: korelf/service-captcha:0.8.2 # restart: always depends_on: - db @@ -65,6 +73,8 @@ services: captcha-redis: image: redis:3.0-alpine # restart: always + volumes: + - ./captcha-app/redis/data:/data db: image: docker.io/mysql:8.0.33 command: --default-authentication-plugin=mysql_native_password diff --git a/docker-compose.yml b/docker-compose.yml index 5b39030..f04c3a3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,6 +15,8 @@ services: - ./app/application:/var/www/html app-redis: image: redis:3.0-alpine + volumes: + - ./redis/data:/data captcha-app: image: korelf/service-captcha:0.8.1 @@ -62,6 +64,8 @@ services: env_file: captcha-app/.env captcha-redis: image: redis:3.0-alpine + volumes: + - ./captcha-app/redis/data:/data db: image: docker.io/mysql:8.0.33 command: --default-authentication-plugin=mysql_native_password diff --git a/redis/.gitignore b/redis/.gitignore new file mode 100644 index 0000000..adbb97d --- /dev/null +++ b/redis/.gitignore @@ -0,0 +1 @@ +data/ \ No newline at end of file