diff --git a/docker-compose.build.yml b/docker-compose.build.yml index 8dadd78..71890c7 100644 --- a/docker-compose.build.yml +++ b/docker-compose.build.yml @@ -12,6 +12,7 @@ services: ports: - '9511:80' + backend_office_prod: restart: always build: @@ -22,15 +23,6 @@ services: command: 'python3 app.py --host 0.0.0.0' - print_service_prod: - restart: on-failure - build: - context: ../eamco_print_service - dockerfile: Dockerfile - ports: - - '8000:9512' - command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8000' - money_service_prod: restart: on-failure @@ -42,6 +34,16 @@ services: command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8001' + auto_service_prod: + restart: on-failure + build: + context: ../eamco_auto_service + dockerfile: Dockerfile + ports: + - '9514:8001' + command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8001' + + frontend_driver_prod: restart: on-failure build: diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3ffc901..f20922e 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,4 +1,3 @@ -version: '3.8' name: eamco @@ -19,62 +18,49 @@ services: frontend_office_dev: restart: on-failure build: - context: ../eamco_frontend + context: ../eamco_office_frontend dockerfile: Dockerfile volumes: - - ../eamco_frontend:/app + - ../eamco_office_frontend:/app ports: - '9511:5173' command: 'vite dev --host --port 5173' -# frontend_driver_dev: -# restart: on-failure -# build: -# context: ../eamco_driver_frontend -# dockerfile: Dockerfile -# volumes: -# - ../eamco_driver_frontend:/app -# ports: -# - '9000:9000' -# command: 'quasar dev' + frontend_driver_dev: + restart: on-failure + build: + context: ../eamco_driver_frontend + dockerfile: Dockerfile + volumes: + - ../eamco_driver_frontend:/app + ports: + - '9000:9000' + command: 'quasar dev' -# print_service_dev: -# restart: on-failure -# build: -# context: ../eamco_print_service -# dockerfile: Dockerfile -# volumes: -# - ../eamco_print_service:/app -# - ../eamco_print_service/tickets:/app/tickets -# ports: -# - '9512:8000' -# command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8000' + money_dev: + restart: on-failure + build: + context: ../eamco_money_api + dockerfile: Dockerfile + volumes: + - ../eamco_money_api:/app + ports: + - '9513:8000' + command: 'uvicorn main:app --reload --host 0.0.0.0 --port 8000' -# money_service_dev: -# restart: on-failure -# build: -# context: ../eamco_money_service -# dockerfile: Dockerfile -# volumes: -# - ../eamco_money_service:/app -# ports: -# - '9513:8000' -# command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8001' - - -# auto_dev: -# restart: on-failure -# build: -# context: ../eamco_auto_api -# dockerfile: Dockerfile -# volumes: -# - ../eamco_auto_api:/app -# ports: -# - '9514:8002' -# command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8002' + auto_dev: + restart: on-failure + build: + context: ../eamco_auto_api + dockerfile: Dockerfile + volumes: + - ../eamco_auto_api:/app + ports: + - '9514:8000' + command: 'uvicorn main:app --reload --host 0.0.0.0 --port 8000' diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 91b0b09..b098355 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -4,12 +4,6 @@ version: '3.8' name: eamco services: - frontend_office_prod: - restart: on-failure - image: anekdotin/eamco-frontend_office_prod:latest - ports: - - '9511:80' - backend_office_prod: restart: always @@ -19,19 +13,19 @@ services: command: 'python3 app.py --host 0.0.0.0' - print_service_prod: + + frontend_office_prod: restart: on-failure - image: anekdotin/eamco-print_service_prod:latest + image: anekdotin/eamco-frontend_office_prod:latest ports: - - '9512:8000' - command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8000' + - '9511:80' - money_service_prod: + auto_service_prod: restart: on-failure image: anekdotin/eamco-money_service_prod:latest ports: - - '9513:8001' + - '9514:8001' command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8001' @@ -42,3 +36,10 @@ services: - '9000:9000' + money_service_prod: + restart: on-failure + image: anekdotin/eamco-money_service_prod:latest + ports: + - '9513:8000' + command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8000' +