develop #1

Merged
dokril merged 3 commits from develop into master 2026-05-08 16:05:19 +03:00
4 changed files with 2750 additions and 9 deletions
Showing only changes of commit a3816cbedc - Show all commits

View File

@@ -1,7 +1,6 @@
version: "3.9"
services:
sing-proxy:
container_name: sing-proxy
build:
context: .
dockerfile: docker/Dockerfile.singbox

View File

@@ -4,6 +4,9 @@ ARG SINGBOX_VER=1.12.13
# Устанавливаем зависимости, включая dos2unix для исправления скриптов
RUN apk add --no-cache curl ca-certificates tar jq bash coreutils netcat-openbsd nodejs npm dos2unix && update-ca-certificates
# Устанавливаем pnpm
RUN npm install -g pnpm
# Автоматическое определение архитектуры и установка sing-box
RUN ARCH=$(uname -m) && \
if [ "$ARCH" = "x86_64" ]; then SB_ARCH="amd64"; \
@@ -20,7 +23,7 @@ COPY --chown=suser:suser web/ /app/web/
# Собираем NestJS бэкенд
WORKDIR /app/web/api
RUN npm ci && npm run build && npm prune --omit=dev
RUN CI=true pnpm install --frozen-lockfile && pnpm run build && CI=true pnpm prune --prod
WORKDIR /app
# Исправляем окончания строк (важно для Windows пользователей) и даем права на запуск

View File

@@ -3,6 +3,7 @@
"version": "1.0.0",
"description": "VPN-Proxy backend API",
"private": true,
"packageManager": "pnpm@10.32.1",
"scripts": {
"build": "nest build",
"start": "nest start",
@@ -10,16 +11,16 @@
"start:prod": "node dist/main"
},
"dependencies": {
"@nestjs/common": "^10.4.0",
"@nestjs/core": "^10.4.0",
"@nestjs/platform-express": "^10.4.0",
"@nestjs/common": "^11.1.16",
"@nestjs/core": "^11.1.16",
"@nestjs/platform-express": "^11.1.16",
"reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1"
},
"devDependencies": {
"@nestjs/cli": "^10.4.0",
"@types/express": "^4.17.21",
"@types/node": "^22.0.0",
"@nestjs/cli": "^11.0.16",
"@types/express": "^5.0.6",
"@types/node": "^24.0.0",
"typescript": "^5.7.0"
}
}
}

2738
web/api/pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff