From 23ef27c95b559ca21cce776e8e7cc44eb98a3980 Mon Sep 17 00:00:00 2001 From: user Date: Fri, 26 Sep 2025 09:37:23 +0300 Subject: [PATCH] optimize building --- Makefile | 4 ++-- docker-compose.yml | 50 +++++++++++++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 91847c7..f83ca9a 100644 --- a/Makefile +++ b/Makefile @@ -49,13 +49,13 @@ ps status: $(COMPOSE) ps logs: - $(COMPOSE) logs -f $(SERVICE) + $(COMPOSE) logs -f --since 1h $(SERVICE) logs-%: $(MAKE) logs SERVICE=$* tail: - $(COMPOSE) logs -f --tail=200 $(SERVICE) + $(COMPOSE) logs -f --since 1h $(SERVICE) tail-%: $(MAKE) tail SERVICE=$* diff --git a/docker-compose.yml b/docker-compose.yml index 3af2bb9..2589c79 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,12 @@ services: + uploader-bot-image: + build: + context: ../uploader-bot + dockerfile: Dockerfile + image: ${BACKEND_IMAGE:-uploader-bot:latest} + command: ["true"] + networks: [mynet] + db: image: postgres:16 environment: @@ -18,15 +26,15 @@ services: networks: [mynet] backend-app: - build: - context: ../uploader-bot - dockerfile: Dockerfile + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app env_file: - ./.env environment: - NODE_ROLE=primary depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy ipfs: @@ -90,15 +98,15 @@ services: networks: [mynet] backend-indexer: - build: - context: ../uploader-bot - dockerfile: Dockerfile + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app indexer env_file: - ./.env environment: - NODE_ROLE=worker depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy backend-app: @@ -113,14 +121,15 @@ services: networks: [mynet] backend-ton-daemon: - build: - context: ../uploader-bot + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app ton_daemon env_file: - ./.env environment: - NODE_ROLE=worker depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy backend-app: @@ -135,14 +144,15 @@ services: networks: [mynet] backend-license-index: - build: - context: ../uploader-bot + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app license_index env_file: - ./.env environment: - NODE_ROLE=worker depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy backend-app: @@ -157,14 +167,15 @@ services: networks: [mynet] backend-convert-process: - build: - context: ../uploader-bot + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app convert_process env_file: - ./.env environment: - NODE_ROLE=worker depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy backend-app: @@ -180,14 +191,15 @@ services: networks: [mynet] backend-convert-v3: - build: - context: ../uploader-bot + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app convert_v3 env_file: - ./.env environment: - NODE_ROLE=worker depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy backend-app: @@ -203,14 +215,15 @@ services: networks: [mynet] backend-index-scout-v3: - build: - context: ../uploader-bot + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app index_scout_v3 env_file: - ./.env environment: - NODE_ROLE=worker depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy backend-app: @@ -220,14 +233,15 @@ services: networks: [mynet] backend-derivative-janitor: - build: - context: ../uploader-bot + image: ${BACKEND_IMAGE:-uploader-bot:latest} command: python -m app derivative_janitor env_file: - ./.env environment: - NODE_ROLE=worker depends_on: + uploader-bot-image: + condition: service_completed_successfully db: condition: service_healthy backend-app: