From 5aa47278cbf070a88e9d0efd32575baef4831669 Mon Sep 17 00:00:00 2001
From: Ske <voltasalt@gmail.com>
Date: Mon, 12 Aug 2019 02:44:48 +0200
Subject: [PATCH] Revert "Attempt to speed up Docker building"

This reverts commit f5c52918770e98f0aab694db05c844b8f7f1313d.
---
 Dockerfile         | 13 +------------
 docker-compose.yml |  6 +++---
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bf1f1d72..18653e98 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,9 @@
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine
 
 WORKDIR /app
-
-# Copy all solution files to container, and run restore
-COPY PluralKit.API/PluralKit.API.csproj /app/PluralKit.API/
-COPY PluralKit.Bot/PluralKit.Bot.csproj /app/PluralKit.Bot/
-COPY PluralKit.Core/PluralKit.Core.csproj /app/PluralKit.Core/
-COPY PluralKit.Web/PluralKit.Web.csproj /app/PluralKit.Web/
-COPY PluralKit.sln /app
-RUN dotnet restore 
-
-# Copy actual source code to container and build
 COPY PluralKit.API /app/PluralKit.API
 COPY PluralKit.Bot /app/PluralKit.Bot
 COPY PluralKit.Core /app/PluralKit.Core
 COPY PluralKit.Web /app/PluralKit.Web
+COPY PluralKit.sln /app
 RUN dotnet build
-
-ENTRYPOINT dotnet run
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c900718..6a5f313e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   bot:
     build: .
-    command: ["--project", "PluralKit.Bot"]
+    entrypoint: ["dotnet", "run", "--project", "PluralKit.Bot"]
     environment:
       - "PluralKit:Database=Host=db;Username=postgres;Password=postgres;Database=postgres;Maximum Pool Size=1000"
       - "PluralKit:InfluxUrl=http://influx:8086"
@@ -17,7 +17,7 @@ services:
     restart: always
   web:
     build: .
-    command: ["--project", "PluralKit.Web"]
+    entrypoint: ["dotnet", "run", "--project", "PluralKit.Web"]
     environment:
       - "PluralKit:Database=Host=db;Username=postgres;Password=postgres;Database=postgres;Maximum Pool Size=1000"
     links: 
@@ -27,7 +27,7 @@ services:
     restart: always
   api:
     build: .
-    command: ["--project", "PluralKit.API"]
+    entrypoint: ["dotnet", "run", "--project", "PluralKit.API"]
     environment:
       - "PluralKit:Database=Host=db;Username=postgres;Password=postgres;Database=postgres;Maximum Pool Size=1000"
     links: