From e22c61557959f0c67132e94da93faf14f6d896c1 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 19 Jan 2019 11:58:17 -0600
Subject: [PATCH] docker tweaks, re-add launch settings

ref: https://github.com/github/gitignore/pull/2705
---
 src/FilterLists.Api/Dockerfile                     | 5 ++---
 src/FilterLists.Api/Properties/launchSettings.json | 9 +++++++++
 src/FilterLists.Web/Dockerfile                     | 2 +-
 src/FilterLists.Web/Properties/launchSettings.json | 9 +++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 src/FilterLists.Api/Properties/launchSettings.json
 create mode 100644 src/FilterLists.Web/Properties/launchSettings.json

diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index 493edd726..097fdf9bd 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -2,12 +2,11 @@ FROM microsoft/dotnet:2.2-sdk-alpine AS publish
 COPY src/FilterLists.Api /FilterLists.Api
 COPY src/FilterLists.Data /FilterLists.Data
 COPY src/FilterLists.Services /FilterLists.Services
-COPY data /data
 RUN dotnet publish FilterLists.Api/FilterLists.Api.csproj -c Release -o /out
 
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS final
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine
 COPY --from=publish /out .
-COPY --from=publish data /data
+COPY data /data
 ENV ASPNETCORE_URLS http://+:5000
 EXPOSE 5000
 ENTRYPOINT ["dotnet", "FilterLists.Api.dll"]
\ No newline at end of file
diff --git a/src/FilterLists.Api/Properties/launchSettings.json b/src/FilterLists.Api/Properties/launchSettings.json
new file mode 100644
index 000000000..d76e83551
--- /dev/null
+++ b/src/FilterLists.Api/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Docker": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/docs/index.html"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/FilterLists.Web/Dockerfile b/src/FilterLists.Web/Dockerfile
index ddc121457..adb8f9af8 100644
--- a/src/FilterLists.Web/Dockerfile
+++ b/src/FilterLists.Web/Dockerfile
@@ -3,7 +3,7 @@ COPY FilterLists.Web /FilterLists.Web
 RUN apk add --update nodejs-npm \
 	&& dotnet publish FilterLists.Web/FilterLists.Web.csproj -c Release -o /out
 
-FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine AS final
+FROM microsoft/dotnet:2.2-aspnetcore-runtime-alpine
 COPY --from=publish /out .
 ENV ASPNETCORE_URLS http://+:5001
 EXPOSE 5001
diff --git a/src/FilterLists.Web/Properties/launchSettings.json b/src/FilterLists.Web/Properties/launchSettings.json
new file mode 100644
index 000000000..b86a23994
--- /dev/null
+++ b/src/FilterLists.Web/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Docker": {
+      "commandName": "Docker",
+      "launchBrowser": true,
+      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/"
+    }
+  }
+}
\ No newline at end of file