Merge pull request #130 from petabridge/dev

v1.3.1 Release
petabridge · Mar 11, 2020 · a9f07c4 · a9f07c4
2 parents 62c2781 + 17691dc
commit a9f07c4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 37 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,4 +1,2 @@
-#### 1.3.0 November 22 2019 ####
-* [Enable SSL needs management](https://github.com/petabridge/lighthouse/issues/102)
-* Updated all underlying dependencies.
-* Updated Windows Server base Docker image.
+#### 1.3.1 March 12 2020 ####
+* Updated to use Akka.NET v1.4.1.
diff --git a/src/Lighthouse/Dockerfile-linux b/src/Lighthouse/Dockerfile-linux
@@ -1,15 +1,6 @@
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1 AS base
 WORKDIR /app
 
-# should be a comma-delimited list
-ENV CLUSTER_SEEDS "[]"
-ENV CLUSTER_IP ""
-ENV CLUSTER_PORT "4053"
-
-# 9110 - Petabridge.Cmd
-# 4053 - Akka.Cluster
-EXPOSE 9110 4053
-
 # Install Petabridge.Cmd client so it can be invoked remotely via
 # Docker or K8s 'exec` commands
 RUN dotnet tool install --global pbm 
@@ -29,4 +20,14 @@ COPY --from=base /root/.dotnet /root/.dotnet/
 # Needed because https://stackoverflow.com/questions/51977474/install-dotnet-core-tool-dockerfile
 ENV PATH="${PATH}:/root/.dotnet/tools"
 
+# should be a comma-delimited list
+ENV CLUSTER_SEEDS "[]"
+ENV CLUSTER_IP ""
+ENV CLUSTER_PORT "4053"
+ENV AKKA__CLUSTER__SPLIT_BRAIN_RESOLVER__ACTIVE_STRATEGY "keep-majority"
+
+# 9110 - Petabridge.Cmd
+# 4053 - Akka.Cluster
+EXPOSE 9110 4053
+
 CMD ["dotnet", "Lighthouse.dll"]
diff --git a/src/Lighthouse/Dockerfile-windows b/src/Lighthouse/Dockerfile-windows
@@ -1,15 +1,6 @@
 FROM mcr.microsoft.com/dotnet/core/sdk:2.1-nanoserver-1803 AS base
 WORKDIR /app
 
-# should be a comma-delimited list
-ENV CLUSTER_SEEDS "[]"
-ENV CLUSTER_IP ""
-ENV CLUSTER_PORT "4053"
-
-# 9110 - Petabridge.Cmd
-# 4053 - Akka.Cluster
-EXPOSE 9110 4053
-
 # Install Petabridge.Cmd client so it can be invoked remotely via
 # Docker or K8s 'exec` commands
 #RUN dotnet tool install --global pbm 
@@ -29,4 +20,14 @@ COPY --from=base /app /app
 # copy .NET Core global tool
 # COPY --from=base /root/.dotnet /root/.dotnet/
 
+# should be a comma-delimited list
+ENV CLUSTER_SEEDS "[]"
+ENV CLUSTER_IP ""
+ENV CLUSTER_PORT "4053"
+ENV AKKA__CLUSTER__SPLIT_BRAIN_RESOLVER__ACTIVE_STRATEGY "keep-majority"
+
+# 9110 - Petabridge.Cmd
+# 4053 - Akka.Cluster
+EXPOSE 9110 4053
+
 CMD ["dotnet", "Lighthouse.dll"]
diff --git a/src/Lighthouse/Lighthouse.csproj b/src/Lighthouse/Lighthouse.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Akka.Cluster" Version="$(AkkaVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="3.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="3.1.2" />
     <PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PbmVersion)" />
     <PackageReference Include="Petabridge.Cmd.Remote" Version="$(PbmVersion)" />
     <PackageReference Include="Akka.Bootstrap.Docker">
-      <Version>0.2.2</Version>
+      <Version>0.3.0</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/src/common.props b/src/common.props
@@ -2,28 +2,26 @@
   <PropertyGroup>
     <Copyright>Copyright © 2015-2019 Petabridge, LLC</Copyright>
     <Authors>Petabridge</Authors>
-    <VersionPrefix>1.3.0</VersionPrefix>
-    <PackageReleaseNotes>[Enable SSL needs management](https://github.com/petabridge/lighthouse/issues/102)
-Updated all underlying dependencies.
-Updated Windows Server base Docker image.</PackageReleaseNotes>
+    <VersionPrefix>1.3.1</VersionPrefix>
+    <PackageReleaseNotes>Updated to use Akka.NET v1.4.1.</PackageReleaseNotes>
     <PackageIconUrl>https://petabridge.com/images/logo.png</PackageIconUrl>
-    <PackageProjectUrl>
-      https://github.com/petabridge/lighthouse
+    <PackageProjectUrl>
+      https://github.com/petabridge/lighthouse
     </PackageProjectUrl>
-    <PackageLicenseUrl>
-      https://github.com/petabridge/lighthouse/blob/dev/LICENSE
+    <PackageLicenseUrl>
+      https://github.com/petabridge/lighthouse/blob/dev/LICENSE
     </PackageLicenseUrl>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
     <XunitVersion>2.4.1</XunitVersion>
-    <MicrosoftSdkVersion>16.4.0</MicrosoftSdkVersion>
-    <FluentAssertionsVersion>5.9.0</FluentAssertionsVersion>
+    <MicrosoftSdkVersion>16.5.0</MicrosoftSdkVersion>
+    <FluentAssertionsVersion>5.10.2</FluentAssertionsVersion>
     <NetCoreVersion>netcoreapp2.1</NetCoreVersion>
     <NetStandardVersion>netstandard1.6</NetStandardVersion>
     <NetFrameworkLibVersion>net461</NetFrameworkLibVersion>
     <NetFrameworkTestVersion>net461</NetFrameworkTestVersion>
-    <AkkaVersion>1.3.16</AkkaVersion>
-    <PbmVersion>0.7.0</PbmVersion>
+    <AkkaVersion>1.4.1</AkkaVersion>
+    <PbmVersion>0.7.1</PbmVersion>
   </PropertyGroup>
 </Project>