From 116279517aea1dffd0202cb6bb28d5088a7c7f31 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sat, 27 Apr 2019 16:12:12 -0500
Subject: [PATCH] compose API now working

---
 docker-compose.filterlists-api.yml   |  9 +++++--
 src/FilterLists.Api/Dockerfile       | 16 ++++++++-----
 src/FilterLists.Api/appsettings.json | 36 ----------------------------
 3 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 src/FilterLists.Api/appsettings.json

diff --git a/docker-compose.filterlists-api.yml b/docker-compose.filterlists-api.yml
index 2a2c51844..037bc5017 100644
--- a/docker-compose.filterlists-api.yml
+++ b/docker-compose.filterlists-api.yml
@@ -4,12 +4,17 @@ services:
   filterlists-api:
     image: collinbarrett/filterlists.api
     build:
-      context: src
-      dockerfile: FilterLists.Api/Dockerfile
+      context: .
+      dockerfile: src/FilterLists.Api/Dockerfile
+    ports:
+     - "80:80"
+     - "443:443"
     networks:
       - filterlists-api
     depends_on:
       - mariadb_filterlists-api
+    environment:
+      ConnectionStrings__FilterListsConnection: "Server=mariadb_filterlists-api;Database=filterlistsdata;Uid=filterlists;Pwd=C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833;"
 
   mariadb_filterlists-api:
     image: mariadb:10
diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index 1bd04b954..1c2890b5c 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -1,15 +1,19 @@
-# Context: src
-# Command: docker build -f FilterLists.Api/Dockerfile .
+# Context: .
+# Command: docker build -f src/FilterLists.Api/Dockerfile .
 
 FROM mcr.microsoft.com/dotnet/core/sdk:2.2-alpine AS build
 WORKDIR /app
 
-COPY FilterLists.Data/. ./FilterLists.Data/
-COPY FilterLists.Services/. ./FilterLists.Services/
-COPY FilterLists.Api/. ./FilterLists.Api/
-RUN dotnet publish FilterLists.Api/*.csproj -c Release -o out
+COPY src/FilterLists.Data/. ./FilterLists.Data/
+COPY src/FilterLists.Services/. ./FilterLists.Services/
+COPY src/FilterLists.Api/. ./FilterLists.Api/
+RUN dotnet publish FilterLists.Api/FilterLists.Api.csproj -c Release -o out
 
 FROM mcr.microsoft.com/dotnet/core/aspnet:2.2-alpine
 WORKDIR /app
 COPY --from=build /app/FilterLists.Api/out ./
+COPY data/. ./data/
+ENV DataDirectory:Path="data"
+EXPOSE 80
+EXPOSE 443
 ENTRYPOINT ["dotnet", "FilterLists.Api.dll"]
\ No newline at end of file
diff --git a/src/FilterLists.Api/appsettings.json b/src/FilterLists.Api/appsettings.json
deleted file mode 100644
index 0e5529e9b..000000000
--- a/src/FilterLists.Api/appsettings.json
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  WARNING - This file will be checked into source control. Do not change this file.
-  Use this as an example file only.
-  Use {env.EnvironmentName}.json as your configuration file as it will not be checked into source control.
-  {env.EnvironmentName} values : development, staging, production
-*/
-{
-  "ApplicationInsights": {
-    "InstrumentationKey": ""
-  },
-  "ConnectionStrings": {
-    "FilterListsConnection": "Server=FilterLists.MariaDB;Database=filterlistsdata;Uid=filterlists;Pwd=C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833;"
-  },
-  "DataDirectory": {
-    "Path": "data"
-  },
-  "Logging": {
-    "IncludeScopes": false,
-    "LogLevel": {
-      "Default": "Debug",
-      "System": "Information",
-      "Microsoft": "Information"
-    }
-  },
-  "SendGrid": {
-    "ApiKey": "",
-    "From": {
-      "Name": "",
-      "EmailAddress": ""
-    },
-    "To": {
-      "Name": "",
-      "EmailAddress": ""
-    }
-  }
-}
\ No newline at end of file