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

Версия 0.2.1 #2

Merged
kor-elf merged 8 commits from develop into main 2024-06-12 00:03:11 +05:00
Conversation 0 Commits 8 Files Changed 16 +34 -9
6 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2910509218 - Show all commits

1
app/application/.env.example
View File

@@ -11,7 +11,6 @@ CAPTCHA_STATIC_PATH=http://your-domain-captcha-or-IP:8081/captcha
CAPTCHA_PUBLIC_TOKEN= CAPTCHA_PUBLIC_TOKEN=
APP_FORCE_HTTPS=false APP_FORCE_HTTPS=false
#UNIT_SOURCE="\"172.16.0.0/12\""
APP_DEFAULT_LOCALE=ru APP_DEFAULT_LOCALE=ru
APP_FAKER_LOCALE=ru_RU APP_FAKER_LOCALE=ru_RU

1
captcha-app/redis/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
data/

18
docker-compose-prod.yml
View File

@@ -14,12 +14,17 @@ services:
- ${DOCKER_APP_PORT}:9000 - ${DOCKER_APP_PORT}:9000
volumes: volumes:
- ./app/application:/var/www/html - ./app/application:/var/www/html
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '["172.16.0.0/12"]'
app-redis: app-redis:
image: redis:3.0-alpine image: redis:3.0-alpine
# restart: always # restart: always
volumes:
- ./redis/data:/data
captcha-app: captcha-app:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
cap_drop: cap_drop:
- ALL - ALL
@@ -32,10 +37,13 @@ services:
- db - db
- captcha-redis - captcha-redis
env_file: captcha-app/.env env_file: captcha-app/.env
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '["172.16.0.0/12"]'
ports: ports:
- ${DOCKER_CAPTCHA_PORT}:9000 - ${DOCKER_CAPTCHA_PORT}:9000
captcha-queue: captcha-queue:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- db - db
@@ -44,7 +52,7 @@ services:
CONTAINER_ROLE: queue CONTAINER_ROLE: queue
env_file: captcha-app/.env env_file: captcha-app/.env
captcha-reverb: captcha-reverb:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- db - db
@@ -55,7 +63,7 @@ services:
ports: ports:
- ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000 - ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000
captcha-scheduler: captcha-scheduler:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- db - db
@@ -66,6 +74,8 @@ services:
captcha-redis: captcha-redis:
image: redis:3.0-alpine image: redis:3.0-alpine
# restart: always # restart: always
volumes:
- ./captcha-app/redis/data:/data
db: db:
image: docker.io/mysql:8.0.33 image: docker.io/mysql:8.0.33
command: --default-authentication-plugin=mysql_native_password command: --default-authentication-plugin=mysql_native_password

18
docker-compose-prod_docker-hub.yml
View File

@@ -10,15 +10,20 @@ services:
ports: ports:
- ${DOCKER_APP_PORT}:9000 - ${DOCKER_APP_PORT}:9000
env_file: app/.env env_file: app/.env
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '["172.16.0.0/12"]'
volumes: volumes:
- ./app/storage/app:/var/www/html/storage/app - ./app/storage/app:/var/www/html/storage/app
- ./app/storage/logs:/var/www/html/storage/logs - ./app/storage/logs:/var/www/html/storage/logs
app-redis: app-redis:
image: redis:3.0-alpine image: redis:3.0-alpine
# restart: always # restart: always
volumes:
- ./redis/data:/data
captcha-app: captcha-app:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
cap_drop: cap_drop:
- ALL - ALL
@@ -33,8 +38,11 @@ services:
env_file: captcha-app/.env env_file: captcha-app/.env
ports: ports:
- ${DOCKER_CAPTCHA_PORT}:9000 - ${DOCKER_CAPTCHA_PORT}:9000
environment:
CONTAINER_ROLE: app
UNIT_SOURCE: '["172.16.0.0/12"]'
captcha-queue: captcha-queue:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- db - db
@@ -43,7 +51,7 @@ services:
CONTAINER_ROLE: queue CONTAINER_ROLE: queue
env_file: captcha-app/.env env_file: captcha-app/.env
captcha-reverb: captcha-reverb:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- db - db
@@ -54,7 +62,7 @@ services:
ports: ports:
- ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000 - ${DOCKER_CAPTCHA_WEBSOCKET_PORT}:9000
captcha-scheduler: captcha-scheduler:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.2
# restart: always # restart: always
depends_on: depends_on:
- db - db
@@ -65,6 +73,8 @@ services:
captcha-redis: captcha-redis:
image: redis:3.0-alpine image: redis:3.0-alpine
# restart: always # restart: always
volumes:
- ./captcha-app/redis/data:/data
db: db:
image: docker.io/mysql:8.0.33 image: docker.io/mysql:8.0.33
command: --default-authentication-plugin=mysql_native_password command: --default-authentication-plugin=mysql_native_password

4
docker-compose.yml
View File

@@ -15,6 +15,8 @@ services:
- ./app/application:/var/www/html - ./app/application:/var/www/html
app-redis: app-redis:
image: redis:3.0-alpine image: redis:3.0-alpine
volumes:
- ./redis/data:/data
captcha-app: captcha-app:
image: korelf/service-captcha:0.8.1 image: korelf/service-captcha:0.8.1
@@ -62,6 +64,8 @@ services:
env_file: captcha-app/.env env_file: captcha-app/.env
captcha-redis: captcha-redis:
image: redis:3.0-alpine image: redis:3.0-alpine
volumes:
- ./captcha-app/redis/data:/data
db: db:
image: docker.io/mysql:8.0.33 image: docker.io/mysql:8.0.33
command: --default-authentication-plugin=mysql_native_password command: --default-authentication-plugin=mysql_native_password

1
redis/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
data/