Merge pull request #90 from petabridge/dev

v1.2.0 Release
petabridge · Jul 29, 2019 · f7a3a44 · f7a3a44
2 parents 0bb0b43 + cf6dd16
commit f7a3a44
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 30 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,2 @@
-#### 1.1.0 June 26 2019 ####
-* Reduced [Docker image size by a factor of 10](https://github.com/petabridge/lighthouse/pull/84).
-* Upgraded to [Petabridge.Cmd v0.6.2](https://cmd.petabridge.com/articles/RELEASE_NOTES.html#the-highlights-of-changes-made-in-petabridgecmd-v060-2)
+#### 1.2.0 July 29 2019 ####
+* Fixed problem with v1.1.0 image of Lighthouse, which prevented `pbm` from being executed internally via `docker exec`. `pbm` can now be called normally again from within the container.
diff --git a/src/Lighthouse/Dockerfile-linux b/src/Lighthouse/Dockerfile-linux
@@ -14,9 +14,6 @@ EXPOSE 9110 4053
 # Docker or K8s 'exec` commands
 RUN dotnet tool install --global pbm 
 
-# Needed because https://stackoverflow.com/questions/51977474/install-dotnet-core-tool-dockerfile
-ENV PATH="${PATH}:/root/.dotnet/tools"
-
 # RUN pbm help
 
 COPY ./bin/Release/netcoreapp2.1/publish/ /app
@@ -29,4 +26,7 @@ COPY --from=base /app /app
 # copy .NET Core global tool
 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"
+
 CMD ["dotnet", "Lighthouse.dll"]
diff --git a/src/common.props b/src/common.props
@@ -1,28 +1,27 @@
-<Project>
-  <PropertyGroup>
-    <Copyright>Copyright © 2015-2019 Petabridge, LLC</Copyright>
-    <Authors>Petabridge</Authors>
-    <VersionPrefix>1.1.0</VersionPrefix>
-    <PackageReleaseNotes>Reduced [Docker image size by a factor of 10](https://github.com/petabridge/lighthouse/pull/84).
-Upgraded to [Petabridge.Cmd v0.6.2](https://cmd.petabridge.com/articles/RELEASE_NOTES.html#the-highlights-of-changes-made-in-petabridgecmd-v060-2)</PackageReleaseNotes>
-    <PackageIconUrl>https://petabridge.com/images/logo.png</PackageIconUrl>
+<Project>
+  <PropertyGroup>
+    <Copyright>Copyright © 2015-2019 Petabridge, LLC</Copyright>
+    <Authors>Petabridge</Authors>
+    <VersionPrefix>1.2.0</VersionPrefix>
+    <PackageReleaseNotes>Fixed problem with v1.1.0 image of Lighthouse, which prevented `pbm` from being executed internally via `docker exec`. `pbm` can now be called normally again from within the container.</PackageReleaseNotes>
+    <PackageIconUrl>https://petabridge.com/images/logo.png</PackageIconUrl>
     <PackageProjectUrl>
       https://github.com/petabridge/lighthouse
-    </PackageProjectUrl>
+    </PackageProjectUrl>
     <PackageLicenseUrl>
       https://github.com/petabridge/lighthouse/blob/dev/LICENSE
-    </PackageLicenseUrl>
-    <NoWarn>$(NoWarn);CS1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <XunitVersion>2.4.1</XunitVersion>
-    <MicrosoftSdkVersion>15.9.0</MicrosoftSdkVersion>
-    <FluentAssertionsVersion>5.6.0</FluentAssertionsVersion>
-    <NetCoreVersion>netcoreapp2.1</NetCoreVersion>
-    <NetStandardVersion>netstandard1.6</NetStandardVersion>
-    <NetFrameworkLibVersion>net461</NetFrameworkLibVersion>
-    <NetFrameworkTestVersion>net461</NetFrameworkTestVersion>
-    <AkkaVersion>1.3.13</AkkaVersion>
-    <PbmVersion>0.6.2</PbmVersion>
-  </PropertyGroup>
-</Project>
+    </PackageLicenseUrl>
+    <NoWarn>$(NoWarn);CS1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup>
+    <XunitVersion>2.4.1</XunitVersion>
+    <MicrosoftSdkVersion>15.9.0</MicrosoftSdkVersion>
+    <FluentAssertionsVersion>5.6.0</FluentAssertionsVersion>
+    <NetCoreVersion>netcoreapp2.1</NetCoreVersion>
+    <NetStandardVersion>netstandard1.6</NetStandardVersion>
+    <NetFrameworkLibVersion>net461</NetFrameworkLibVersion>
+    <NetFrameworkTestVersion>net461</NetFrameworkTestVersion>
+    <AkkaVersion>1.3.13</AkkaVersion>
+    <PbmVersion>0.6.2</PbmVersion>
+  </PropertyGroup>
+</Project>