fixed docker-compose build

petabridge · Feb 4, 2019 · ffb052a · ffb052a
1 parent d712ae4
commit ffb052a
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 82 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,10 @@ version: '3.4'
 
 services:
   lighthouse:
-    image: petabridge/lighthouse:v0.9.2
+    image: webcrawler.lighthouse
+    build:
+      context: .
+      dockerfile: src/Lighthouse/Dockerfile
     ports:
       - '9110:9110'
       - '4053:4053'

diff --git a/src/Lighthouse/Dockerfile b/src/Lighthouse/Dockerfile
@@ -1,21 +1,29 @@
-FROM microsoft/dotnet:1.1-sdk AS build-env
+FROM microsoft/dotnet:2.0-runtime AS base
 WORKDIR /app
 
-ENV ACTORSYSTEM "lighthouse"
-
 # should be a comma-delimited list
-ENV SEEDS "[]"
+ENV CLUSTER_SEEDS "[]"
+ENV CLUSTER_IP ""
+ENV CLUSTER_PORT "4053"
+
+FROM microsoft/dotnet:2.0-sdk AS build
+WORKDIR /src
+COPY *.sln ./
+COPY ./get-dockerip.sh ./get-dockerip.sh
+COPY src/Lighthouse/Lighthouse.csproj src/Lighthouse/
 
-COPY src/Lighthouse/*.csproj ./
 RUN dotnet restore
+COPY . .
+WORKDIR /src/src/Lighthouse
+RUN dotnet build -c Release -o /app
 
-COPY src/Lighthouse ./
-RUN dotnet publish -c Release --framework netcoreapp1.1 -o out
+FROM build AS publish
+RUN dotnet publish -c Release -o /app
 
-FROM microsoft/dotnet:1.1-runtime AS runtime
+FROM base AS final
 WORKDIR /app
-COPY --from=build-env /app/out ./
-COPY --from=build-env /app/get-dockerip.sh ./get-dockerip.sh
+COPY --from=publish /app ./
+COPY --from=build /src/get-dockerip.sh ./get-dockerip.sh
 ENTRYPOINT ["/bin/bash","get-dockerip.sh"]
 
 # 9110 - Petabridge.Cmd

diff --git a/src/Lighthouse/Lighthouse.csproj b/src/Lighthouse/Lighthouse.csproj
@@ -2,10 +2,11 @@
   <Import Project="..\common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>$(NetCoreVersion)</TargetFrameworks>
+    <TargetFramework>$(NetCoreVersion)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Akka.Cluster" Version="$(AkkaVersion)" />
+    <PackageReference Include="Akka.Cluster.HealthCheck" Version="$(AkkaHealthCheckVersion)" />
     <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="$(PetabridgeCmdVersion)" />

diff --git a/src/Lighthouse/Program.NetCore.cs b/src/Lighthouse/Program.NetCore.cs
@@ -2,9 +2,8 @@
 
 namespace Lighthouse
 {
-    public partial class Program
+    public class Program
     {
-#if NETCOREAPP1_1
         public static void Main(string[] args)
         {
             var lighthouseService = new LighthouseService();
@@ -16,6 +15,5 @@ public static void Main(string[] args)
             };
             lighthouseService.TerminationHandle.Wait(); 
         }
-#endif
     }
 }
diff --git a/src/Lighthouse/Program.NetFramework.cs b/src/Lighthouse/Program.NetFramework.cs
diff --git a/src/WebCrawler.CrawlService/WebCrawler.CrawlService.csproj b/src/WebCrawler.CrawlService/WebCrawler.CrawlService.csproj
@@ -1,23 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(NetCoreVersion)</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="crawler.hocon" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="crawler.hocon">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Bootstrap.Docker" Version="0.1.3" />
-    <PackageReference Include="Akka.Cluster" Version="1.3.10" />
+    <PackageReference Include="Akka.Bootstrap.Docker" Version="$(AkkaBootstrapVersion)" />
+    <PackageReference Include="Akka.Cluster" Version="$(AkkaVersion)" />
+    <PackageReference Include="Akka.Cluster.HealthCheck" Version="$(AkkaHealthCheckVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/WebCrawler.Shared.IO/WebCrawler.Shared.IO.csproj b/src/WebCrawler.Shared.IO/WebCrawler.Shared.IO.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Streams" Version="1.3.10" />
+    <PackageReference Include="Akka.Streams" Version="$(AkkaVersion)" />
     <PackageReference Include="HtmlAgilityPack" Version="1.7.1" />
   </ItemGroup>
 

diff --git a/src/WebCrawler.Shared/WebCrawler.Shared.csproj b/src/WebCrawler.Shared/WebCrawler.Shared.csproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.3.10" />
+    <PackageReference Include="Akka" Version="$(AkkaVersion)" />
   </ItemGroup>
 
 </Project>
diff --git a/src/WebCrawler.TrackerService/WebCrawler.TrackerService.csproj b/src/WebCrawler.TrackerService/WebCrawler.TrackerService.csproj
@@ -1,23 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(NetCoreVersion)</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Remove="tracker.hocon" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="tracker.hocon">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Bootstrap.Docker" Version="0.1.3" />
-    <PackageReference Include="Akka.Cluster" Version="1.3.10" />
+    <PackageReference Include="Akka.Bootstrap.Docker" Version="$(AkkaBootstrapVersion)" />
+    <PackageReference Include="Akka.Cluster" Version="$(AkkaVersion)" />
+    <PackageReference Include="Akka.Cluster.HealthCheck" Version="$(AkkaHealthCheckVersion)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/WebCrawler.Web/WebCrawler.Web.csproj b/src/WebCrawler.Web/WebCrawler.Web.csproj
@@ -1,19 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <Import Project="..\common.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>$(NetCoreVersion)</TargetFramework>
     <DockerComposeProjectPath>..\..\docker-compose.dcproj</DockerComposeProjectPath>
   </PropertyGroup>
-  <ItemGroup>
-    <None Remove="web.hocon" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="web.hocon">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Akka.Bootstrap.Docker" Version="0.1.3" />
-    <PackageReference Include="Akka.Cluster" Version="1.3.10" />
+    <PackageReference Include="Akka.Bootstrap.Docker" Version="$(AkkaBootstrapVersion)" />
+    <PackageReference Include="Akka.Cluster" Version="$(AkkaVersion)" />
+    <PackageReference Include="Akka.Cluster.HealthCheck" Version="$(AkkaHealthCheckVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.0.2" />