From 3902f5d36f16762034751e29eae612e8155cdd94 Mon Sep 17 00:00:00 2001 From: Leonid Nikitin Date: Sat, 27 Jul 2024 01:40:45 +0500 Subject: [PATCH] my-projects-website:0.3.0. --- docker-compose-prod.yml | 9 ++++--- docker-compose-prod_docker-hub.yml | 41 +++++++++++++++++++++++++++--- docker-compose.yml | 9 ++++--- 3 files changed, 49 insertions(+), 10 deletions(-) diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index c1c9fdf..2470a03 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -47,7 +47,8 @@ services: - ./app/application:/var/www/html app-redis: - image: redis:3.0-alpine + image: redis:3.0-alpine # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/redis:3.0-alpine # MDHub # restart: always volumes: - ./redis/data:/data @@ -101,12 +102,14 @@ services: CONTAINER_ROLE: scheduler env_file: captcha-app/.env captcha-redis: - image: redis:3.0-alpine + image: redis:3.0-alpine # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/redis:3.0-alpine # MDHub # restart: always volumes: - ./captcha-app/redis/data:/data db: - image: docker.io/mysql:8.0.33 + image: docker.io/mysql:8.0.33 # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/mysql:8.0.33 # MDHub command: --default-authentication-plugin=mysql_native_password #restart: always ports: diff --git a/docker-compose-prod_docker-hub.yml b/docker-compose-prod_docker-hub.yml index 96e25cf..304cb07 100644 --- a/docker-compose-prod_docker-hub.yml +++ b/docker-compose-prod_docker-hub.yml @@ -1,7 +1,8 @@ version: '3.7' services: app: - image: korelf/my-projects-website:0.2.1 + # image: korelf/my-projects-website:0.3.0 # docker hub + image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.3.0 # MDHub # restart: always depends_on: - db @@ -16,8 +17,38 @@ services: volumes: - ./app/storage/app:/var/www/html/storage/app - ./app/storage/logs:/var/www/html/storage/logs + + queue: + # image: korelf/my-projects-website:0.3.0 # docker hub + image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.3.0 # MDHub + # restart: always + depends_on: + - db + - app-redis + environment: + CONTAINER_ROLE: queue + env_file: app/.env + volumes: + - ./app/storage/app:/var/www/html/storage/app + - ./app/storage/logs:/var/www/html/storage/logs + + scheduler: + # image: korelf/my-projects-website:0.3.0 # docker hub + image: docker.mdhub.kor-elf.net/kor-elf/my-projects-website:0.3.0 # MDHub + # restart: always + depends_on: + - db + - app-redis + environment: + CONTAINER_ROLE: scheduler + env_file: app/.env + volumes: + - ./app/storage/app:/var/www/html/storage/app + - ./app/storage/logs:/var/www/html/storage/logs + app-redis: - image: redis:3.0-alpine + image: redis:3.0-alpine # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/redis:3.0-alpine # MDHub # restart: always volumes: - ./redis/data:/data @@ -71,12 +102,14 @@ services: CONTAINER_ROLE: scheduler env_file: captcha-app/.env captcha-redis: - image: redis:3.0-alpine + image: redis:3.0-alpine # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/redis:3.0-alpine # MDHub # restart: always volumes: - ./captcha-app/redis/data:/data db: - image: docker.io/mysql:8.0.33 + image: docker.io/mysql:8.0.33 # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/mysql:8.0.33 # MDHub command: --default-authentication-plugin=mysql_native_password #restart: always ports: diff --git a/docker-compose.yml b/docker-compose.yml index aa0e032..0c76bc0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -41,7 +41,8 @@ services: - ./app/application:/var/www/html app-redis: - image: redis:3.0-alpine + image: redis:3.0-alpine # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/redis:3.0-alpine # MDHub volumes: - ./redis/data:/data @@ -102,11 +103,13 @@ services: - ./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 + image: redis:3.0-alpine # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/redis:3.0-alpine # MDHub volumes: - ./captcha-app/redis/data:/data db: - image: docker.io/mysql:8.0.33 + image: docker.io/mysql:8.0.33 # docker hub + # image: docker.mdhub.kor-elf.net/kor-elf/mysql:8.0.33 # MDHub command: --default-authentication-plugin=mysql_native_password #restart: always ports: