From bc5f7fae62b4ebbf8d5559000a8da9ec3795f53d Mon Sep 17 00:00:00 2001 From: Sergey Karmanov Date: Thu, 2 Jan 2025 16:28:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D0=BB=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80=20=D1=84=D0=B0?= =?UTF-8?q?=D0=B9=D0=BB=20=D0=BF=D0=BE=D0=B4=20=D1=81=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=BA=D1=83=20=D1=81=D1=82=D0=B8=D0=BB=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 2 +- src/Otchinslator/Dockerfile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 34c62e2..b835473 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: container_name: Otchislator image: git.zetcraft.ru/serega404/otchislator:main ports: - - "8025:80" + - "8025:8080" volumes: - /srv/otchislator/pdfs:/app/PDFCache environment: diff --git a/src/Otchinslator/Dockerfile b/src/Otchinslator/Dockerfile index 946a9c4..e36879c 100644 --- a/src/Otchinslator/Dockerfile +++ b/src/Otchinslator/Dockerfile @@ -3,15 +3,18 @@ USER root RUN apk update && apk add --no-cache curl icu tzdata musl-locales musl-locales-lang USER $APP_UID WORKDIR /app -EXPOSE 80 +EXPOSE 8080 FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build ARG BUILD_CONFIGURATION=Release +RUN apt update && apt install npm WORKDIR /src COPY ["Otchinslator.csproj", "Otchinslator.csproj"] RUN dotnet restore "Otchinslator.csproj" COPY . . WORKDIR "/src" +RUN npm ci +RUN npx tailwindcss -i ./wwwroot/css/site.css -o ./wwwroot/css/styles.css --minify RUN dotnet build "Otchinslator.csproj" -c $BUILD_CONFIGURATION -o /app/build FROM build AS publish