diff --git a/docker-compose.yml b/docker-compose.yml index 96f80cf..32e3636 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: backend-app: build: - context: ./uploader-bot + context: ../uploader-bot dockerfile: Dockerfile command: python -m app env_file: @@ -53,9 +53,9 @@ services: GOMEMLIMIT: "7500MiB" volumes: - ${IPFS_DATA_DIR_HOST:-./data/ipfs}:/data/ipfs - - ./configs/ipfs/init/001-config.sh:/container-init.d/001-config.sh:ro + - ./ipfs/init/001-config.sh:/container-init.d/001-config.sh:ro # Опционально: приватный swarm.key. Смонтируйте файл, если он есть. - - ${IPFS_SWARM_KEY_FILE:-./configs/ipfs/swarm.key}:/data/ipfs/swarm.key:ro + - ${IPFS_SWARM_KEY_FILE:-./ipfs/swarm.key}:/data/ipfs/swarm.key:ro ports: - "4001:4001/tcp" - "4001:4001/udp" @@ -86,7 +86,7 @@ services: backend-indexer: build: - context: ./uploader-bot + context: ../uploader-bot dockerfile: Dockerfile command: python -m app indexer env_file: @@ -108,7 +108,7 @@ services: backend-ton-daemon: build: - context: ./uploader-bot + context: ../uploader-bot command: python -m app ton_daemon env_file: - ../.env @@ -129,7 +129,7 @@ services: backend-license-index: build: - context: ./uploader-bot + context: ../uploader-bot command: python -m app license_index env_file: - ../.env @@ -150,7 +150,7 @@ services: backend-convert-process: build: - context: ./uploader-bot + context: ../uploader-bot command: python -m app convert_process env_file: - ../.env @@ -172,7 +172,7 @@ services: backend-convert-v3: build: - context: ./uploader-bot + context: ../uploader-bot command: python -m app convert_v3 env_file: - ../.env @@ -195,7 +195,7 @@ services: backend-index-scout-v3: build: - context: ./uploader-bot + context: ../uploader-bot command: python -m app index_scout_v3 env_file: - ../.env @@ -212,7 +212,7 @@ services: backend-derivative-janitor: build: - context: ./uploader-bot + context: ../uploader-bot command: python -m app derivative_janitor env_file: - ../.env @@ -229,7 +229,7 @@ services: frontend: build: - context: ./web2-client + context: ../web2-client dockerfile: Dockerfile args: VITE_SENTRY_DSN: ${VITE_SENTRY_DSN} diff --git a/start.sh b/start.sh index 55e855a..84dcb96 100644 --- a/start.sh +++ b/start.sh @@ -249,11 +249,11 @@ if [[ $COMPOSE_PROJECT != [a-z0-9]* ]]; then COMPOSE_PROJECT="n$COMPOSE_PROJECT" fi if command -v docker compose >/dev/null 2>&1; then - docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" down --remove-orphans - docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" up -d --build --force-recreate + docker compose --env-file "$ENV_FILE" -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" down --remove-orphans + docker compose --env-file "$ENV_FILE" -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" up -d --build --force-recreate else - docker-compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" down --remove-orphans - docker-compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" up -d --build --force-recreate + docker-compose --env-file "$ENV_FILE" -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" down --remove-orphans + docker-compose --env-file "$ENV_FILE" -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE_PATH" up -d --build --force-recreate fi set +x