Skip to content

Commit

Permalink
standardizing project assets
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaronontheweb committed Feb 4, 2019
1 parent 520d1ff commit d59728b
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 27 deletions.
10 changes: 5 additions & 5 deletions WebCrawler.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebCrawler.CrawlService", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebCrawler.Web", "src\WebCrawler.Web\WebCrawler.Web.csproj", "{297D37F3-5CAA-4B4F-A6EA-0A76AFDDE80C}"
EndProject
Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{188B87E9-7FF0-4488-A340-FE8A62688B27}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lighthouse", "src\Lighthouse\Lighthouse.csproj", "{7A2C40A8-F6D1-4A28-8FD4-886818D7CB35}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -41,10 +41,10 @@ Global
{297D37F3-5CAA-4B4F-A6EA-0A76AFDDE80C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{297D37F3-5CAA-4B4F-A6EA-0A76AFDDE80C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{297D37F3-5CAA-4B4F-A6EA-0A76AFDDE80C}.Release|Any CPU.Build.0 = Release|Any CPU
{188B87E9-7FF0-4488-A340-FE8A62688B27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{188B87E9-7FF0-4488-A340-FE8A62688B27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{188B87E9-7FF0-4488-A340-FE8A62688B27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{188B87E9-7FF0-4488-A340-FE8A62688B27}.Release|Any CPU.Build.0 = Release|Any CPU
{7A2C40A8-F6D1-4A28-8FD4-886818D7CB35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A2C40A8-F6D1-4A28-8FD4-886818D7CB35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A2C40A8-F6D1-4A28-8FD4-886818D7CB35}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A2C40A8-F6D1-4A28-8FD4-886818D7CB35}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
14 changes: 0 additions & 14 deletions src/Lighthouse.Tests/Lighthouse.Tests.csproj

This file was deleted.

25 changes: 25 additions & 0 deletions src/Lighthouse/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
FROM microsoft/dotnet:1.1-sdk AS build-env
WORKDIR /app

ENV ACTORSYSTEM "lighthouse"

# should be a comma-delimited list
ENV SEEDS "[]"

COPY src/Lighthouse/*.csproj ./
RUN dotnet restore

COPY src/Lighthouse ./
RUN dotnet publish -c Release --framework netcoreapp1.1 -o out

FROM microsoft/dotnet:1.1-runtime AS runtime
WORKDIR /app
COPY --from=build-env /app/out ./
COPY --from=build-env /app/get-dockerip.sh ./get-dockerip.sh
ENTRYPOINT ["/bin/bash","get-dockerip.sh"]

# 9110 - Petabridge.Cmd
# 4053 - Akka.Cluster
EXPOSE 9110 4053

CMD ["dotnet", "Lighthouse.dll"]
11 changes: 4 additions & 7 deletions src/Lighthouse/Lighthouse.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\common.props" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
<TargetFrameworks>$(NetCoreVersion)</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Akka.Cluster" Version="1.3.7" />
<PackageReference Include="Akka.Cluster" Version="$(AkkaVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="1.1.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="1.1.2" />
<PackageReference Include="Petabridge.Cmd.Cluster" Version="0.3.3" />
</ItemGroup>
<!-- Conditionally obtain references for .NET Framework 4.5.2 -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
<PackageReference Include="Topshelf" Version="4.0.3" />
<PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PetabridgeCmdVersion)" />
</ItemGroup>
<ItemGroup>
<None Update="akka.hocon">
Expand Down
7 changes: 6 additions & 1 deletion src/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@
<NoWarn>$(NoWarn);CS1591</NoWarn>
</PropertyGroup>
<PropertyGroup>
<XunitVersion>2.3.0-beta4-*</XunitVersion>
<XunitVersion>2.3.1</XunitVersion>
<AkkaVersion>1.3.11</AkkaVersion>
<AkkaBootstrapVersion>0.1.3</AkkaBootstrapVersion>
<AkkaHealthCheckVersion>0.1.0</AkkaHealthCheckVersion>
<PetabridgeCmdVersion>0.4.1</PetabridgeCmdVersion>
<NetCoreVersion>netcoreapp2.0</NetCoreVersion>
</PropertyGroup>
</Project>

0 comments on commit d59728b

Please sign in to comment.