✨ Добавлен файл .cursorignore для исключения определённых файлов из индексации. Обновлены зависимости в docker-compose.dev.yml, добавлены условия здоровья для сервисов MongoDB и Redis. Изменён способ создания пользователя в Dockerfile.dev для улучшения совместимости. Обновлён способ получения версии приложения в check.action.ts с использованием package.json.

Author: MairwunNx

.cursorignore

@@ -0,0 +1,2 @@
+!.devcontainer/devcontainer.env
+!.env

.devcontainer/Dockerfile.dev

@@ -11,8 +11,10 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     bash \
     && apt-get clean -y && rm -rf /var/lib/apt/lists/*
 
-RUN groupadd --gid 1000 devuser \
-    && useradd --uid 1000 --gid devuser --shell /bin/bash --create-home devuser
+RUN if ! getent group 1000 >/dev/null 2>&1; then groupadd --gid 1000 devuser; \
+    elif [ "$(getent group 1000 | cut -d: -f1)" != "devuser" ]; then groupmod -n devuser $(getent group 1000 | cut -d: -f1); fi \
+    && if ! id -u 1000 >/dev/null 2>&1; then useradd --uid 1000 --gid 1000 --shell /bin/bash --create-home devuser; \
+    elif [ "$(id -un 1000)" != "devuser" ]; then usermod -l devuser -d /home/devuser -m -s /bin/bash $(id -un 1000); fi
 
 USER devuser
 

.devcontainer/docker-compose.dev.yml

@@ -10,7 +10,11 @@ services:
     cap_add: [ "SYS_PTRACE" ]
     command: ["sleep", "infinity"]
     container_name: dickobrazz-server-dev
-    depends_on: [ dickobrazz-mongo, dickobrazz-redis ]
+    depends_on:
+      dickobrazz-mongo:
+        condition: service_healthy
+      dickobrazz-redis:
+        condition: service_healthy
     env_file: [ devcontainer.env ]
     networks: [ base ]
     ports: [ "3030:3030" ]
@@ -23,11 +27,6 @@ services:
     container_name: dickobrazz-mongo
     cpus: '0.5'
     env_file: [ devcontainer.env ]
-    environment:
-      MONGO_INITDB_DATABASE: ${MONGO_INITDB_DATABASE}
-      MONGO_INITDB_ROOT_PASSWORD: ${MONGO_INITDB_ROOT_PASSWORD}
-      MONGO_INITDB_ROOT_USERNAME: ${MONGO_INITDB_ROOT_USERNAME}
-      TZ: ${TZ}
     healthcheck:
       interval: 15s
       retries: 12
@@ -48,22 +47,18 @@ services:
     volumes:
       - dickobrazz-mongo-data:/data/db
   dickobrazz-redis:
-    command: >
-      redis-server --port 6379
-      --loglevel warning
-      --save 20 1
-      --requirepass ${REDIS_PASSWORD}
+    command:
+      - sh
+      - -c
+      - 'exec redis-server --port 6379 --loglevel warning --save "20 1" --requirepass "$$REDIS_PASSWORD"'
     container_name: dickobrazz-redis
     cpus: '0.5'
     env_file: [ devcontainer.env ]
-    environment:
-      REDIS_PASSWORD: ${REDIS_PASSWORD}
-      TZ: ${TZ}
     healthcheck:
       interval: 10s
       retries: 3
       start_period: 10s
-      test: ["CMD", "sh", "-c", "redis-cli -a ${REDIS_PASSWORD} --no-auth-warning ping"]
+      test: ["CMD-SHELL", "redis-cli -a $$REDIS_PASSWORD --no-auth-warning ping"]
       timeout: 5s
     image: redis:8.4-alpine
     logging:

src/features/health/check.action.ts

@@ -3,6 +3,7 @@ import mongoose from "mongoose";
 import { di } from "@/shared/injection";
 import { logger } from "@/shared/lib/logger";
 import { createTicker } from "@/shared/lib/profiling";
+import packageJson from "../../../package.json";
 import type { HealthResponse, HealthStatus } from "./types";
 
 const startTime = Date.now();
@@ -56,8 +57,7 @@ export const createCheckAction = (redis: RedisClient) => async (): Promise<Healt
 
   const [mongoStatus, redisStatus] = await Promise.all([checkMongo(), checkRedis(redis)]);
 
-  const versionFile = Bun.file(".version");
-  const version = (await versionFile.text()).trim();
+  const version = packageJson.version;
   const uptimeSec = Math.floor((Date.now() - startTime) / 1000);
   const overallStatus: HealthStatus = mongoStatus === "ok" && redisStatus === "ok" ? "ok" : mongoStatus === "down" || redisStatus === "down" ? "down" : "degraded";