From 931e2076a52dc72f1300b5b5c38575c51a49abea Mon Sep 17 00:00:00 2001
From: Romeo Dumitrescu <winromulus@winromulus.com>
Date: Sun, 12 Jan 2020 17:55:16 +0200
Subject: [PATCH] Fix SDK version

---
 ES.SFTP.Host/Dockerfile                    | 4 ++--
 deploy/helm/sftp/templates/deployment.yaml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ES.SFTP.Host/Dockerfile b/ES.SFTP.Host/Dockerfile
index 893650f..4b5af81 100644
--- a/ES.SFTP.Host/Dockerfile
+++ b/ES.SFTP.Host/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1 AS base
 RUN apt-get update && \
     # - Install required packages
     #
@@ -21,7 +21,7 @@ RUN apt-get update && \
 WORKDIR /app
 EXPOSE 22 80
 
-FROM mcr.microsoft.com/dotnet/core/sdk:3.0-buster AS build
+FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build
 WORKDIR /src
 COPY ["ES.SFTP.Host/ES.SFTP.Host.csproj", "ES.SFTP.Host/"]
 RUN dotnet restore "ES.SFTP.Host/ES.SFTP.Host.csproj"
diff --git a/deploy/helm/sftp/templates/deployment.yaml b/deploy/helm/sftp/templates/deployment.yaml
index 00f39d7..b08a0d8 100644
--- a/deploy/helm/sftp/templates/deployment.yaml
+++ b/deploy/helm/sftp/templates/deployment.yaml
@@ -26,7 +26,11 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
+          {{- if .Values.image.tag }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          {{- else }}
+          image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+          {{- end }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: ssh