Move userscript to server
This commit is contained in:
@@ -26,4 +26,8 @@
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.1.7" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="wwwroot\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -6,14 +6,22 @@ USER $APP_UID
|
||||
WORKDIR /app
|
||||
EXPOSE 8080
|
||||
|
||||
# This stage is used to build the userscript project
|
||||
FROM node:lts-alpine AS build-userscript
|
||||
WORKDIR /src
|
||||
COPY client .
|
||||
RUN npm ci
|
||||
RUN npm run build
|
||||
#RUN ls -la /src/dist
|
||||
|
||||
# This stage is used to build the service project
|
||||
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
|
||||
ARG BUILD_CONFIGURATION=Release
|
||||
WORKDIR /src
|
||||
COPY ["CPATapi.Server/CPATapi.Server.csproj", "CPATapi.Server/"]
|
||||
RUN dotnet restore "CPATapi.Server/CPATapi.Server.csproj"
|
||||
COPY ["server/src/CPATapi.Server/CPATapi.Server.csproj", "server/src/CPATapi.Server/CPATapi.Server.csproj"]
|
||||
RUN dotnet restore "server/src/CPATapi.Server/CPATapi.Server.csproj"
|
||||
COPY . .
|
||||
WORKDIR "/src/CPATapi.Server"
|
||||
WORKDIR "/src/server/src/CPATapi.Server"
|
||||
RUN dotnet build "./CPATapi.Server.csproj" -c $BUILD_CONFIGURATION -o /app/build
|
||||
|
||||
# This stage is used to publish the service project to be copied to the final stage
|
||||
@@ -25,4 +33,5 @@ RUN dotnet publish "./CPATapi.Server.csproj" -c $BUILD_CONFIGURATION -o /app/pub
|
||||
FROM base AS final
|
||||
WORKDIR /app
|
||||
COPY --from=publish /app/publish .
|
||||
COPY --from=build-userscript ["/src/dist/3CX TAPI.prod.user.js", "./wwwroot/3CX_TAPI.user.js"]
|
||||
ENTRYPOINT ["dotnet", "CPATapi.Server.dll"]
|
||||
|
||||
@@ -30,6 +30,7 @@ if (app.Environment.IsDevelopment())
|
||||
app.UseDeveloperExceptionPage();
|
||||
}
|
||||
|
||||
app.MapStaticAssets();
|
||||
app.MapOpenApi();
|
||||
app.UseSwaggerUI(options =>
|
||||
{
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
@echo off
|
||||
setlocal
|
||||
cd /d %~dp0
|
||||
|
||||
docker build -t source.cp-austria.at/cpatrd/3cx_tapi:latest -f Dockerfile ..
|
||||
if errorlevel 1 (
|
||||
echo.
|
||||
echo ERROR: Docker build failed!
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
|
||||
SET /P AREYOUSURE=Publish to source.cp-austria.at? (Y/[N])
|
||||
IF /I "%AREYOUSURE%" NEQ "Y" GOTO END
|
||||
|
||||
docker push source.cp-austria.at/cpatrd/3cx_tapi:latest
|
||||
|
||||
:END
|
||||
endlocal
|
||||
Reference in New Issue
Block a user