From 0fde55a3edc9828089eeb6fa6bd5b32d879132fa Mon Sep 17 00:00:00 2001
From: octopusbob <bob.walker@octopus.com>
Date: Fri, 2 Oct 2020 10:26:19 -0500
Subject: [PATCH] Fixing the .net core sdk not found issue

---
 tentacle-k8sworker/Dockerfile | 13 +++++++++++++
 tentacle-worker/Dockerfile    | 12 ++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/tentacle-k8sworker/Dockerfile b/tentacle-k8sworker/Dockerfile
index 42a4005..3e331de 100644
--- a/tentacle-k8sworker/Dockerfile
+++ b/tentacle-k8sworker/Dockerfile
@@ -9,6 +9,19 @@ ARG Ecs_Cli_Version=1.20.0
 ARG Aws_Iam_Authenticator_Version=0.5.1
 ARG Umoci_Version=0.4.6
 
+# get powershell for 18.04
+RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \
+    dpkg -i packages-microsoft-prod.deb && \
+    apt-get update && \
+    add-apt-repository universe && \
+    apt-get install -y powershell=${Powershell_Version}
+
+# Get .NET SDK 3.1
+# https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1804
+RUN apt-get install -y apt-transport-https && \
+    apt-get update && \
+    apt-get install -y dotnet-sdk-3.1
+
 # Get AZ Powershell core modules
 # https://docs.microsoft.com/en-us/powershell/azure/install-az-ps?view=azps-3.6.1
 RUN pwsh -c 'Install-Module -Force -Name Az -AllowClobber -Scope AllUsers -MaximumVersion "'${Azure_Powershell_Version}'"'
diff --git a/tentacle-worker/Dockerfile b/tentacle-worker/Dockerfile
index a57beb7..0fbea6c 100644
--- a/tentacle-worker/Dockerfile
+++ b/tentacle-worker/Dockerfile
@@ -14,12 +14,6 @@ ARG Ecs_Cli_Version=1.20.0
 ARG Aws_Iam_Authenticator_Version=0.5.1
 ARG Umoci_Version=0.4.6
 
-# Get .NET SDK 3.1
-# https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1804
-RUN apt-get install -y apt-transport-https && \
-    apt-get update && \
-    apt-get install -y dotnet-sdk-3.1
-
 # get powershell for 18.04
 RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb && \
     dpkg -i packages-microsoft-prod.deb && \
@@ -27,6 +21,12 @@ RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsof
     add-apt-repository universe && \
     apt-get install -y powershell=${Powershell_Version}
 
+# Get .NET SDK 3.1
+# https://docs.microsoft.com/en-us/dotnet/core/install/linux-package-manager-ubuntu-1804
+RUN apt-get install -y apt-transport-https && \
+    apt-get update && \
+    apt-get install -y dotnet-sdk-3.1
+
 # Get Octo CLI
 # https://octopus.com/downloads/octopuscli#linux
 RUN apt-get update && \