From 0bbfd99aa7ee54d62e5dead18eacaf64d0988211 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Mon, 10 Feb 2020 10:46:51 -0600
Subject: [PATCH] de-couple debug v. prod base build step

---
 docker-compose.override.yml                   | 10 +++++++++-
 server/src/FilterLists.Agent/Dockerfile       | 10 +++-------
 server/src/FilterLists.Agent/debug.Dockerfile |  6 ++++++
 server/src/FilterLists.Api/Dockerfile         | 12 +++---------
 server/src/FilterLists.Api/debug.Dockerfile   |  8 ++++++++
 5 files changed, 29 insertions(+), 17 deletions(-)
 create mode 100644 server/src/FilterLists.Agent/debug.Dockerfile
 create mode 100644 server/src/FilterLists.Api/debug.Dockerfile

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 76d859efb..c653c7e3b 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -5,4 +5,12 @@ services:
     ports:
       - "80:80"
     volumes:
-      - ./ops/nginx/conf.d.dev:/etc/nginx/conf.d:ro
\ No newline at end of file
+      - ./ops/nginx/conf.d.dev:/etc/nginx/conf.d:ro
+      
+  api:
+    build:
+      dockerfile: server/src/FilterLists.Api/debug.Dockerfile
+
+  agent:
+    build:
+      dockerfile: server/src/FilterLists.Agent/debug.Dockerfile
diff --git a/server/src/FilterLists.Agent/Dockerfile b/server/src/FilterLists.Agent/Dockerfile
index 4efd2737d..6510e0326 100644
--- a/server/src/FilterLists.Agent/Dockerfile
+++ b/server/src/FilterLists.Agent/Dockerfile
@@ -1,12 +1,8 @@
 # Context: .
 # Command: docker build -f server/src/FilterLists.Agent/Dockerfile .
 
-# init base debug (for VS)
-FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
-WORKDIR /app
-
-# init base-prod
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-alpine as base-prod
+# init base
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-alpine as base
 ENTRYPOINT ["./FilterLists.Agent"]
 WORKDIR /app
 
@@ -40,5 +36,5 @@ FROM build AS publish
 RUN dotnet publish -c Release -r linux-musl-x64 -o out --no-restore --no-build
 
 # final
-FROM base-prod as final
+FROM base as final
 COPY --from=publish /app/src/FilterLists.Agent/out .
diff --git a/server/src/FilterLists.Agent/debug.Dockerfile b/server/src/FilterLists.Agent/debug.Dockerfile
new file mode 100644
index 000000000..f5b88921a
--- /dev/null
+++ b/server/src/FilterLists.Agent/debug.Dockerfile
@@ -0,0 +1,6 @@
+# Context: .
+# Command: docker build -f server/src/FilterLists.Agent/debug.Dockerfile .
+
+# init base debug (for VS)
+FROM mcr.microsoft.com/dotnet/core/runtime:3.1-buster-slim AS base
+WORKDIR /app
diff --git a/server/src/FilterLists.Api/Dockerfile b/server/src/FilterLists.Api/Dockerfile
index 164a1b003..b04ba1176 100644
--- a/server/src/FilterLists.Api/Dockerfile
+++ b/server/src/FilterLists.Api/Dockerfile
@@ -1,14 +1,8 @@
 # Context: .
 # Command: docker build -f server/src/FilterLists.Api/Dockerfile .
 
-# init base debug (for VS)
-FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
-EXPOSE 80
-COPY data/. data/
-WORKDIR /app
-
-# init base-prod
-FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-alpine as base-prod
+# init base
+FROM mcr.microsoft.com/dotnet/core/runtime-deps:3.1-alpine as base
 ENTRYPOINT ["./FilterLists.Api"]
 EXPOSE 80
 COPY data/. data/
@@ -67,5 +61,5 @@ FROM build AS publish
 RUN dotnet publish -c Release -r linux-musl-x64 -o out --no-restore --no-build
 
 # final
-FROM base-prod as final
+FROM base as final
 COPY --from=publish /app/src/FilterLists.Api/out .
diff --git a/server/src/FilterLists.Api/debug.Dockerfile b/server/src/FilterLists.Api/debug.Dockerfile
new file mode 100644
index 000000000..7a5b2c61c
--- /dev/null
+++ b/server/src/FilterLists.Api/debug.Dockerfile
@@ -0,0 +1,8 @@
+# Context: .
+# Command: docker build -f server/src/FilterLists.Api/debug.Dockerfile .
+
+# init base debug (for VS)
+FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base
+EXPOSE 80
+COPY data/. data/
+WORKDIR /app