From f1b64bcf475e76f0dc7478c40da8be1b618b0763 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Sun, 13 Jan 2019 19:45:18 -0600
Subject: [PATCH] progress in mariadb docker composition

---
 docker-compose.yml                   | 40 +++++++++++++++++-----------
 src/FilterLists.Api/Dockerfile       |  8 +++---
 src/FilterLists.Api/appsettings.json |  4 +--
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8223b0d34..0a6eaf611 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,29 +1,37 @@
 version: '3.7'
 services:
-    filterlists.mariadb:
-        image: mariadb
-    filterlists.nginx:
-        build:
-            context: ./nginx
-        ports:
-            - '80:80'
-            - '443:443'
-        links:
-            - filterlists.api
-            - filterlists.web
+    filterlists.db:
+        image: mariadb:latest
+        restart: always
+        environment:
+            MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+            MYSQL_DATABASE: filterlistsdata
+            MYSQL_USER: filterlists
+            MYSQL_PASSWORD: C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833
     filterlists.api:
         image: '${DOCKER_REGISTRY-}filterlistsapi'
         build:
-            context: ./src
-            dockerfile: ./FilterLists.Api/Dockerfile
+            context: .
+            dockerfile: ./src/FilterLists.Api/Dockerfile
         expose:
             - '5000'
-        links:
-            - filterlists.mariadb
+        depends_on:
+            - filterlists.db
     filterlists.web:
         image: '${DOCKER_REGISTRY-}filterlistsweb'
         build:
             context: ./src
             dockerfile: ./FilterLists.Web/Dockerfile
         expose:
-            - '5001'
\ No newline at end of file
+            - '5001'
+        depends_on:
+            - filterlists.api
+    filterlists.nginx:
+        build:
+            context: ./nginx
+        ports:
+            - '80:80'
+            - '443:443'
+        depends_on:
+            - filterlists.api
+            - filterlists.web
\ No newline at end of file
diff --git a/src/FilterLists.Api/Dockerfile b/src/FilterLists.Api/Dockerfile
index 8024a03e1..493edd726 100644
--- a/src/FilterLists.Api/Dockerfile
+++ b/src/FilterLists.Api/Dockerfile
@@ -1,11 +1,13 @@
 FROM microsoft/dotnet:2.2-sdk-alpine AS publish
-COPY FilterLists.Api /FilterLists.Api
-COPY FilterLists.Data /FilterLists.Data
-COPY FilterLists.Services /FilterLists.Services
+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
 COPY --from=publish /out .
+COPY --from=publish 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/appsettings.json b/src/FilterLists.Api/appsettings.json
index 40219fe34..10fd560b9 100644
--- a/src/FilterLists.Api/appsettings.json
+++ b/src/FilterLists.Api/appsettings.json
@@ -9,10 +9,10 @@
     "InstrumentationKey": ""
   },
   "ConnectionStrings": {
-    "FilterListsConnection": ""
+    "FilterListsConnection": "Server=filterlists.db;Database=filterlistsdata;Uid=filterlists;Pwd=C53A28194242D82288E1E84A37E56D3EC7DFF83F1D9E018AF19E9BA27A5DF833;"
   },
   "DataDirectory": {
-    "Path": "..\\..\\data"
+    "Path": "data"
   },
   "Logging": {
     "IncludeScopes": false,