Skip to content

Commit cabbf97

Browse files
ismcagdasismcagdas
authored
Merge pull request #645 from aspnetboilerplate/feat/docker-fixes
Update docker files
2 parents a7eb8c0 + 8540f63 commit cabbf97

File tree

7 files changed

+70
-56
lines changed

7 files changed

+70
-56
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ 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/docker/mvc/Mvc-Logs/
12+

‎aspnet-core/build/build-mvc.ps1‎

Lines changed: 20 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,20 @@
1-
# COMMON PATHS
2-
3-
$buildFolder = (Get-Item -Path "./" -Verbose).FullName
4-
$slnFolder = Join-Path $buildFolder "../"
5-
$outputFolder = Join-Path $buildFolder "outputs"
6-
$webMvcFolder = Join-Path $slnFolder "src/AbpCompanyName.AbpProjectName.Web.Mvc"
7-
8-
## CLEAR ######################################################################
9-
10-
Remove-Item $outputFolder -Force -Recurse -ErrorAction Ignore
11-
New-Item -Path $outputFolder -ItemType Directory
12-
13-
## RESTORE NUGET PACKAGES #####################################################
14-
15-
Set-Location $slnFolder
16-
dotnet restore
17-
18-
## PUBLISH WEB MVC PROJECT ###################################################
19-
20-
Set-Location $webMvcFolder
21-
dotnet publish --output (Join-Path $outputFolder "Mvc")
22-
23-
## CREATE DOCKER IMAGES #######################################################
24-
25-
# Mvc
26-
Set-Location (Join-Path $outputFolder "Mvc")
27-
28-
docker rmi abp/mvc -f
29-
docker build -t abp/mvc .
30-
31-
## DOCKER COMPOSE FILES #######################################################
32-
33-
Copy-Item (Join-Path $slnFolder "docker/mvc/*.*") $outputFolder
34-
35-
## FINALIZE ###################################################################
36-
37-
Set-Location $outputFolder
1+
echo " Welcome to docker build"
2+
echo ""
3+
echo ""
4+
5+
$ABP_MVC="abp/mvc"
6+
$ABP_MVC_DOCKERFILE_PATH="src/AbpCompanyName.AbpProjectName.Web.Mvc/Dockerfile"
7+
$ABP_NG="abp/ng"
8+
9+
cd ..
10+
echo " Building docker image $ABP_MVC..."
11+
docker build -t $ABP_MVC -f $ABP_MVC_DOCKERFILE_PATH .
12+
echo " Done. -- Building docker image $ABP_MVC..."
13+
echo ""
14+
echo ""
15+
16+
# echo " Pushing docker image $ABP_MVC..."
17+
# docker push $ABP_MVC
18+
# echo " Done. -- Pushing docker image $ABP_MVC..."
19+
# echo ""
20+
# echo ""

‎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: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1-
version: '2'
1+
version: '3'
22

33
services:
44

5-
abp_mvc:
6-
image: abp/mvc
7-
environment:
8-
- ASPNETCORE_ENVIRONMENT=Staging
9-
ports:
10-
- "9903:80"
11-
volumes:
12-
- "./Mvc-Logs:/app/App_Data/Logs"
5+
abp_host:
6+
image: abp/mvc
7+
environment:
8+
ASPNETCORE_ENVIRONMENT: "Staging"
9+
ConnectionStrings__Default: "Server=10.0.75.1; Database=AbpProjectNameDb; User=sa; Password=123qwe;TrustServerCertificate=True;"
10+
TZ: "America/Toronto"
11+
Kestrel__Endpoints__Http__Url: "http://+:80"
12+
ports:
13+
- "44312:80"
14+
volumes:
15+
- "./Mvc-Logs:/app/App_Data/Logs"
16+
restart: always

‎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"

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Dockerfile‎

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"]

‎aspnet-core/Dockerfile‎ renamed to ‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Dockerfile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,29 @@
11
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
22

3+
RUN dotnet tool install -g Microsoft.Web.LibraryManager.Cli
4+
RUN ln -s ~/.dotnet/tools/libman /usr/local/bin/libman
5+
36
WORKDIR /src
4-
COPY ["src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj", "src/AbpCompanyName.AbpProjectName.Web.Host/"]
7+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj", "src/AbpCompanyName.AbpProjectName.Web.Mvc/"]
58
COPY ["src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj", "src/AbpCompanyName.AbpProjectName.Web.Core/"]
69
COPY ["src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj", "src/AbpCompanyName.AbpProjectName.Application/"]
710
COPY ["src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj", "src/AbpCompanyName.AbpProjectName.Core/"]
811
COPY ["src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj", "src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/"]
9-
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Host"
12+
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Mvc"
1013
RUN dotnet restore
1114

1215
WORKDIR /src
13-
COPY ["src/AbpCompanyName.AbpProjectName.Web.Host", "src/AbpCompanyName.AbpProjectName.Web.Host"]
16+
COPY ["src/AbpCompanyName.AbpProjectName.Web.Mvc", "src/AbpCompanyName.AbpProjectName.Web.Mvc"]
1417
COPY ["src/AbpCompanyName.AbpProjectName.Web.Core", "src/AbpCompanyName.AbpProjectName.Web.Core"]
1518
COPY ["src/AbpCompanyName.AbpProjectName.Application", "src/AbpCompanyName.AbpProjectName.Application"]
1619
COPY ["src/AbpCompanyName.AbpProjectName.Core", "src/AbpCompanyName.AbpProjectName.Core"]
1720
COPY ["src/AbpCompanyName.AbpProjectName.EntityFrameworkCore", "src/AbpCompanyName.AbpProjectName.EntityFrameworkCore"]
18-
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Host"
21+
WORKDIR "/src/src/AbpCompanyName.AbpProjectName.Web.Mvc"
22+
RUN libman restore
1923
RUN dotnet publish -c Release -o /publish --no-restore
2024

2125
FROM mcr.microsoft.com/dotnet/aspnet:7.0
2226
EXPOSE 80
2327
WORKDIR /app
2428
COPY --from=build /publish .
25-
ENTRYPOINT ["dotnet", "AbpCompanyName.AbpProjectName.Web.Host.dll"]
29+
ENTRYPOINT ["dotnet", "AbpCompanyName.AbpProjectName.Web.Mvc.dll"]

0 commit comments

Comments
 (0)