Skip to content

Commit ab0aed6

Browse files
authored
Merge pull request #42 from aspnetboilerplate/docker-webfarm
Docker support
2 parents 8763e0b + 28ff558 commit ab0aed6

29 files changed

+199
-1695
lines changed

angular/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*.launch
1616
.settings/
1717
.vs/
18-
obj/
18+
[Oo]bj/
1919
bin/
2020

2121
# IDE - VSCode

angular/AbpCompanyName.AbpProjectName.AngularUI.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,10 @@
2525
<Reference Include="Microsoft.CSharp" />
2626
</ItemGroup>
2727

28+
<ItemGroup>
29+
<None Update="Dockerfile">
30+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
31+
</None>
32+
</ItemGroup>
33+
2834
</Project>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<ShowAllFiles>true</ShowAllFiles>
5+
</PropertyGroup>
6+
</Project>

angular/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FROM nginx
2+
3+
COPY . /usr/share/nginx/html

angular/obj/AbpCompanyName.AbpProjectName.AngularUI.csproj.nuget.g.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
44
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
55
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6-
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\Repositories\Github\module-zero-core-template\angular\obj\project.assets.json</ProjectAssetsFile>
6+
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">D:\GitHub\module-zero-core-template\angular\obj\project.assets.json</ProjectAssetsFile>
77
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
8-
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\ismcagdas\.nuget\packages\</NuGetPackageFolders>
8+
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\aliriza\.nuget\packages\</NuGetPackageFolders>
99
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10-
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.1.0</NuGetToolVersion>
10+
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">4.2.0</NuGetToolVersion>
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>

angular/obj/Debug/TypeScriptCompilerOutput.txt

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

angular/obj/Debug/net461/.IncrementalCache

Lines changed: 0 additions & 1 deletion
This file was deleted.

angular/obj/Debug/net461/.SDKVersion

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

0 commit comments

Comments
 (0)