Enhance Docker setup and user notification features
- Updated docker-compose.yml to include environment variables and health checks for the app service. - Modified Dockerfile to install curl for health checks and adjusted the build process for backend services. - Improved user notification handling in activation, blocking, and config revocation commands by integrating Telegram notifications. - Added new test cases to validate the updated command handlers and Telegram notifier functionality. - Enhanced documentation to reflect the new Telegram bot features and user management improvements.
This commit is contained in:
+8
-3
@@ -12,13 +12,13 @@ RUN pnpm build
|
||||
# ── Stage 2: publish бэкенда, статика фронта в wwwroot ────────────────────
|
||||
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS backend
|
||||
WORKDIR /src
|
||||
# Сначала манифесты для кэша restore
|
||||
COPY backend/PnvPanel.sln backend/Directory.Build.props backend/Directory.Packages.props ./backend/
|
||||
# Сначала манифесты для кэша restore (только цепочка Api → ... → Domain, без tests/)
|
||||
COPY backend/Directory.Build.props backend/Directory.Packages.props ./backend/
|
||||
COPY backend/src/PnvPanel.Domain/PnvPanel.Domain.csproj ./backend/src/PnvPanel.Domain/
|
||||
COPY backend/src/PnvPanel.Application/PnvPanel.Application.csproj ./backend/src/PnvPanel.Application/
|
||||
COPY backend/src/PnvPanel.Infrastructure/PnvPanel.Infrastructure.csproj ./backend/src/PnvPanel.Infrastructure/
|
||||
COPY backend/src/PnvPanel.Api/PnvPanel.Api.csproj ./backend/src/PnvPanel.Api/
|
||||
RUN dotnet restore backend/PnvPanel.sln
|
||||
RUN dotnet restore backend/src/PnvPanel.Api/PnvPanel.Api.csproj
|
||||
# Исходники бэкенда
|
||||
COPY backend/ ./backend/
|
||||
# Сид каталога приложений (PnvPanel.Api.csproj ссылается на него через ../../../seed/)
|
||||
@@ -30,8 +30,13 @@ RUN dotnet publish backend/src/PnvPanel.Api/PnvPanel.Api.csproj -c Release -o /a
|
||||
# ── Stage 3: runtime ──────────────────────────────────────────────────────
|
||||
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime
|
||||
WORKDIR /app
|
||||
# curl — только для HEALTHCHECK в docker-compose (GET /health), в образе его нет по умолчанию.
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends curl \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
ENV ASPNETCORE_ENVIRONMENT=Production \
|
||||
ASPNETCORE_HTTP_PORTS=8080
|
||||
EXPOSE 8080
|
||||
COPY --from=backend /app/publish ./
|
||||
HEALTHCHECK --interval=15s --timeout=5s --start-period=20s --retries=5 \
|
||||
CMD curl -f http://localhost:8080/health || exit 1
|
||||
ENTRYPOINT ["dotnet", "PnvPanel.Api.dll"]
|
||||
|
||||
Reference in New Issue
Block a user