Skip to content

Commit 6dbfe2f

Browse files
committed
change location of docker files of Host project
1 parent a7eb8c0 commit 6dbfe2f

File tree

7 files changed

+34
-31
lines changed

7 files changed

+34
-31
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ bin/
77
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/App_Data/Logs/
88
aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/App_Data/Logs/
99
aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/Logs/Logs.txt
10+
aspnet-core/build/outputs/
11+

aspnet-core/Dockerfile

Lines changed: 0 additions & 25 deletions
This file was deleted.

aspnet-core/build/build-with-ng.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ echo ""
33
echo ""
44

55
$ABP_HOST="abp/host"
6+
$ABP_HOST_DOCKERFILE_PATH="src/AbpCompanyName.AbpProjectName.Web.Host/Dockerfile"
67
$ABP_NG="abp/ng"
78

89
cd ..
910
echo " Building docker image $ABP_HOST..."
10-
docker build -t $ABP_HOST .
11+
docker build -t $ABP_HOST -f $ABP_HOST_DOCKERFILE_PATH .
1112
echo " Done. -- Building docker image $ABP_HOST..."
1213
echo ""
1314
echo ""

aspnet-core/docker/mvc/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2'
1+
version: '3'
22

33
services:
44

aspnet-core/docker/ng/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
image: abp/host
77
environment:
88
ASPNETCORE_ENVIRONMENT: "Staging"
9-
ConnectionStrings__Default: "Server=10.0.75.1; Database=AbpProjectNameDb; User=AbpProjectNameUser; Password=YourStrongPassword;"
9+
ConnectionStrings__Default: "Server=10.0.75.1; Database=AbpProjectNameDb; User=AbpProjectNameUser; Password=YourStrongPassword;TrustServerCertificate=True;"
1010
App__ServerRootAddress: "http://localhost:44311/"
1111
App__ClientRootAddress: "http://localhost:4200/"
1212
App__CorsOrigins: "http://localhost:4200"
Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
1-
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim
1+
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
22

3-
WORKDIR /app
4-
COPY . .
3+
WORKDIR /src
4+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj", "src/AbpCompanyName.AbpProjectName.Web.Host/"]
5+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj", "src/AbpCompanyName.AbpProjectName.Web.Core/"]
6+
COPY ["src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj", "src/AbpCompanyName.AbpProjectName.Application/"]
7+
COPY ["src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj", "src/AbpCompanyName.AbpProjectName.Core/"]
8+
COPY ["src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj", "src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/"]
9+
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Host"
10+
RUN dotnet restore
11+
12+
WORKDIR /src
13+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Host", "src/AbpCompanyName.AbpProjectName.Web.Host"]
14+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Core", "src/AbpCompanyName.AbpProjectName.Web.Core"]
15+
COPY ["src/AbpCompanyName.AbpProjectName.Application", "src/AbpCompanyName.AbpProjectName.Application"]
16+
COPY ["src/AbpCompanyName.AbpProjectName.Core", "src/AbpCompanyName.AbpProjectName.Core"]
17+
COPY ["src/AbpCompanyName.AbpProjectName.EntityFrameworkCore", "src/AbpCompanyName.AbpProjectName.EntityFrameworkCore"]
18+
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Host"
19+
RUN dotnet publish -c Release -o /publish --no-restore
520

21+
FROM mcr.microsoft.com/dotnet/aspnet:7.0
22+
EXPOSE 80
23+
WORKDIR /app
24+
COPY --from=build /publish .
625
ENTRYPOINT ["dotnet", "AbpCompanyName.AbpProjectName.Web.Host.dll"]
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-stretch-slim
2+
3+
WORKDIR /app
4+
COPY . .
5+
6+
ENTRYPOINT ["dotnet", "AbpCompanyName.AbpProjectName.Web.Host.dll"]

0 commit comments

Comments
 (0)