From 410d241a6fb9cae7fa0af428e6eb15bdfdeca26f Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 16 Apr 2018 18:21:47 -0400 Subject: [PATCH] Downgrade docker for now --- .dockerignore | 2 ++ build/Dockerfile | 4 ++-- src/Tgstation.Server.Host/Controllers/ApiController.cs | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index c3189160e5..341bd88cf1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -5,5 +5,7 @@ docker-compose.yml .vs .vscode legacy +packages +build */bin */obj diff --git a/build/Dockerfile b/build/Dockerfile index b0f90f3cad..2b1cb8c47d 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1-sdk AS build +FROM microsoft/dotnet:2.0-sdk AS build WORKDIR /src COPY tgstation-server.sln ./ @@ -36,7 +36,7 @@ RUN dotnet test -c Release FROM build AS publish RUN dotnet publish -c Release -o /app -FROM microsoft/dotnet:2.1-runtime +FROM microsoft/dotnet:2.0-runtime EXPOSE 80 WORKDIR /app diff --git a/src/Tgstation.Server.Host/Controllers/ApiController.cs b/src/Tgstation.Server.Host/Controllers/ApiController.cs index a75f026057..9c68b32ee3 100644 --- a/src/Tgstation.Server.Host/Controllers/ApiController.cs +++ b/src/Tgstation.Server.Host/Controllers/ApiController.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; using System.Globalization; using System.IdentityModel.Tokens.Jwt; -using System.Linq; using System.Security.Claims; using System.Threading.Tasks; using Tgstation.Server.Api;