From 82e57900e575190734db8f62e66b4f8e5029a8eb Mon Sep 17 00:00:00 2001
From: Elton Stoneman <elton@sixeyed.com>
Date: Thu, 29 Aug 2019 08:09:11 -0600
Subject: [PATCH] Update to .NET Core 2.1 & pin images

---
 docker-compose.yml              |  2 +-
 worker/Dockerfile               | 18 ++++++++++++------
 worker/src/Worker/Worker.csproj | 13 ++++---------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5417f7c..10f1499 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
       - back-tier
 
   redis:
-    image: redis:alpine
+    image: redis:5.0-alpine3.10
     container_name: redis
     ports: ["6379"]
     networks:
diff --git a/worker/Dockerfile b/worker/Dockerfile
index f0a51c4..788a738 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,10 +1,16 @@
-FROM microsoft/dotnet:2.0.0-sdk
+FROM mcr.microsoft.com/dotnet/core/sdk:2.1 as builder
 
-WORKDIR /code
+WORKDIR /Worker
+COPY src/Worker/Worker.csproj .
+RUN dotnet restore
 
-ADD src/Worker /code/src/Worker
+COPY src/Worker/ .
+RUN dotnet publish -c Release -o /out Worker.csproj
 
-RUN dotnet restore -v minimal src/Worker \
-    && dotnet publish -c Release -o "./" "src/Worker/" 
+# app image
+FROM mcr.microsoft.com/dotnet/core/runtime:2.1
 
-CMD dotnet src/Worker/Worker.dll
\ No newline at end of file
+WORKDIR /app
+ENTRYPOINT ["dotnet", "Worker.dll"]
+
+COPY --from=builder /out .
\ No newline at end of file
diff --git a/worker/src/Worker/Worker.csproj b/worker/src/Worker/Worker.csproj
index 997f888..03d43df 100644
--- a/worker/src/Worker/Worker.csproj
+++ b/worker/src/Worker/Worker.csproj
@@ -1,19 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <AssemblyName>Worker</AssemblyName>
     <OutputType>Exe</OutputType>
-    <PackageId>Worker</PackageId>
-    <ServerGarbageCollection>true</ServerGarbageCollection>
-    <RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="1.1.604-alpha" />
-    <PackageReference Include="Npgsql" Version="3.1.3" />
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <PackageReference Include="StackExchange.Redis" Version="2.0.601" />
+    <PackageReference Include="Npgsql" Version="4.0.9" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 
 </Project>
\ No newline at end of file