From 2d05c0a4687e894f75bffb4a7ff3a49f14860c36 Mon Sep 17 00:00:00 2001 From: Anekdotin Date: Thu, 16 May 2024 14:38:07 -0400 Subject: [PATCH] Updated dockerfiles working --- .editorconfig | 1 + docker-compose.build.yml | 52 +++++++++++++++++++++ docker-compose.dev.yml | 99 ++++++++++++++++++---------------------- docker-compose.prod.yml | 44 ++++++++++++++++++ 4 files changed, 142 insertions(+), 54 deletions(-) create mode 100644 .editorconfig create mode 100644 docker-compose.build.yml create mode 100644 docker-compose.prod.yml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..6f06661 --- /dev/null +++ b/.editorconfig @@ -0,0 +1 @@ +root = true \ No newline at end of file diff --git a/docker-compose.build.yml b/docker-compose.build.yml new file mode 100644 index 0000000..8dadd78 --- /dev/null +++ b/docker-compose.build.yml @@ -0,0 +1,52 @@ +version: '3.8' + + +name: eamco +services: + + frontend_office_prod: + restart: on-failure + build: + context: ../eamco_frontend + dockerfile: Dockerfile.prod + ports: + - '9511:80' + + backend_office_prod: + restart: always + build: + context: ../eamco_office_api + dockerfile: Dockerfile.prod + ports: + - '9510:4056' + 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 + build: + context: ../eamco_money_service + dockerfile: Dockerfile + ports: + - '9513:8001' + command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8001' + + + frontend_driver_prod: + restart: on-failure + build: + context: ../eamco_driver_frontend + dockerfile: Dockerfile + ports: + - '9000:9000' + diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b92045d..3ffc901 100755 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,13 +1,10 @@ version: '3.8' -volumes: - eamco_cache: name: eamco services: - backend_office: - container_name: eamco-backend-api-dev + backend_office_dev: restart: always build: context: ../eamco_office_api @@ -15,13 +12,11 @@ services: volumes: - ../eamco_office_api:/app ports: - - '4056:4056' + - '9510:4056' command: 'python3 app.py --host 0.0.0.0' - frontend: - container_name: eamco-frontend-dev - image: eamco/backend-frontend + frontend_office_dev: restart: on-failure build: context: ../eamco_frontend @@ -29,61 +24,57 @@ services: volumes: - ../eamco_frontend:/app ports: - - '5173:5173' + - '9511:5173' command: 'vite dev --host --port 5173' - frontend_driver: - container_name: eamco-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: - container_name: eamco-printer-dev - restart: on-failure - build: - context: ../eamco_print_service - dockerfile: Dockerfile - volumes: - - ../eamco_print_service:/app - - ../eamco_print_service/tickets:/app/tickets - ports: - - '8000:8000' - command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8000' +# 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_service: - container_name: eamco-money-dev - restart: on-failure - build: - context: ../eamco_money_service - dockerfile: Dockerfile - volumes: - - ../eamco_money_service:/app - ports: - - '8001:8000' - command: 'uvicorn app.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: - container_name: eamco-auto-dev - restart: on-failure - build: - context: ../eamco_auto_api - dockerfile: Dockerfile - volumes: - - ../eamco_auto_api:/app - ports: - - '8002:8000' - command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8000' +# 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' diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml new file mode 100644 index 0000000..91b0b09 --- /dev/null +++ b/docker-compose.prod.yml @@ -0,0 +1,44 @@ +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 + image: anekdotin/eamco-backend_office_prod:latest + ports: + - '9510:4056' + command: 'python3 app.py --host 0.0.0.0' + + + print_service_prod: + restart: on-failure + image: anekdotin/eamco-print_service_prod:latest + ports: + - '9512:8000' + command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8000' + + + money_service_prod: + restart: on-failure + image: anekdotin/eamco-money_service_prod:latest + ports: + - '9513:8001' + command: 'uvicorn app.main:app --reload --host 0.0.0.0 --port 8001' + + + frontend_driver_prod: + restart: on-failure + image: anekdotin/eamco-frontend_driver_prod:latest + ports: + - '9000:9000' + +