diff --git a/apps/backend/Dockerfile b/apps/backend/Dockerfile index 19371af..93a4dc9 100644 --- a/apps/backend/Dockerfile +++ b/apps/backend/Dockerfile @@ -59,7 +59,7 @@ COPY --from=builder --chown=nestjs:nodejs /app/package*.json ./ COPY --from=builder --chown=nestjs:nodejs /app/src ./src # Copy startup script (includes migrations) -COPY --chown=nestjs:nodejs startup.js ./startup.js +COPY --chown=nestjs:nodejs scripts/setup/startup.js ./startup.js # Create logs and uploads directories RUN mkdir -p /app/logs && \ diff --git a/docker/docker-compose.full.yml b/docker/docker-compose.full.yml index 9da34d4..9e08ebf 100644 --- a/docker/docker-compose.full.yml +++ b/docker/docker-compose.full.yml @@ -14,8 +14,6 @@ # - MinIO: http://localhost:9001 (console) # ───────────────────────────────────────────────────────────────────────────── -version: '3.8' - services: # ─── Infrastructure ──────────────────────────────────────────────────────── postgres: @@ -69,7 +67,7 @@ services: # ─── Application ─────────────────────────────────────────────────────────── backend: build: - context: ./apps/backend + context: ../apps/backend dockerfile: Dockerfile container_name: xpeditis-backend-dev ports: @@ -83,7 +81,7 @@ services: redis: condition: service_healthy env_file: - - ./apps/backend/.env + - ../apps/backend/.env environment: NODE_ENV: development LOG_FORMAT: json @@ -143,7 +141,7 @@ services: frontend: build: - context: ./apps/frontend + context: ../apps/frontend dockerfile: Dockerfile args: NEXT_PUBLIC_API_URL: http://localhost:4000 @@ -168,7 +166,7 @@ services: ports: - '3100:3100' volumes: - - ./infra/logging/loki/loki-config.yml:/etc/loki/local-config.yaml:ro + - ../infra/logging/loki/loki-config.yml:/etc/loki/local-config.yaml:ro - loki_data:/loki command: -config.file=/etc/loki/local-config.yaml healthcheck: @@ -186,7 +184,7 @@ services: ports: - '9080:9080' volumes: - - ./infra/logging/promtail/promtail-config.yml:/etc/promtail/config.yml:ro + - ../infra/logging/promtail/promtail-config.yml:/etc/promtail/config.yml:ro - /var/run/docker.sock:/var/run/docker.sock:ro command: -config.file=/etc/promtail/config.yml depends_on: @@ -210,7 +208,7 @@ services: GF_ANALYTICS_REPORTING_ENABLED: 'false' GF_ANALYTICS_CHECK_FOR_UPDATES: 'false' volumes: - - ./infra/logging/grafana/provisioning:/etc/grafana/provisioning:ro + - ../infra/logging/grafana/provisioning:/etc/grafana/provisioning:ro - grafana_data:/var/lib/grafana depends_on: loki: @@ -225,7 +223,7 @@ services: log-exporter: build: - context: ./apps/log-exporter + context: ../apps/log-exporter dockerfile: Dockerfile container_name: xpeditis-log-exporter restart: unless-stopped