chore: try docker compose

CumpsD · Jun 15, 2020 · f05bccb · f05bccb
1 parent b32b623
commit f05bccb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 35 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,43 +1,43 @@
 version: "3.7"
 
 services:
-  seq:
-    image: datalust/seq
-    container_name: functional-living-seq
-    hostname: functional-living-seq
-    environment:
-      ACCEPT_EULA: Y
-    ports:
-      - "9001:80"
-      - "9002:5341"
-    networks:
-      - backend
-
   api:
-    build: src/FunctionalLiving.Api/.
-    image: exira-backend
+    build: dist/FunctionalLiving.Api/linux/
     container_name: functional-living-api
     hostname: functional-living-api
+    environment:
+      Serilog__WriteTo__1__Name: Seq
+      Serilog__WriteTo__1__Args__ServerUrl: http://functional-living-seq:9002
     ports:
       - "9000:5000"
-    networks:
-      - backend
     depends_on:
       - seq
     links:
       - seq
 
   knx:
-    build: src/FunctionalLiving.Knx.Sender/.
-    image: exira-backend
+    build: dist/FunctionalLiving.Knx.Sender/linux/
     container_name: functional-living-knx
     hostname: functional-living-knx
-    networks:
-      - backend
+    environment:
+      Knx__RouterIp: 10.0.4.7
+      Knx__LocalIp: 10.150.0.10
+      Api__Endpoint: http://functional-living-api:9000
+      Serilog__WriteTo__1__Name: Seq
+      Serilog__WriteTo__1__Args__ServerUrl: http://functional-living-seq:9002
     depends_on:
       - seq
+      - api
     links:
       - seq
+      - api
 
-networks:
-  backend:
+  seq:
+    image: datalust/seq
+    container_name: functional-living-seq
+    hostname: functional-living-seq
+    environment:
+      ACCEPT_EULA: Y
+    ports:
+      - "9001:80"
+      - "9002:5341"
diff --git a/src/FunctionalLiving.Api/appsettings.json b/src/FunctionalLiving.Api/appsettings.json
@@ -15,12 +15,6 @@
           "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
           "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}",
         }
-      },
-      {
-        "Name": "Seq",
-        "Args": {
-          "ServerUrl": "http://localhost:9002"
-        }
       }
     ],
     "Properties": {

diff --git a/src/FunctionalLiving.Knx.Sender/appsettings.json b/src/FunctionalLiving.Knx.Sender/appsettings.json
@@ -15,7 +15,7 @@
   },
 
   "Api": {
-    "Endpoint": "https://localhost:9000"
+    "Endpoint": "http://localhost:9000"
   },
 
   "Serilog": {
@@ -33,12 +33,6 @@
           "theme": "Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme::Code, Serilog.Sinks.Console",
           "outputTemplate": "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} <s:{SourceContext}>{NewLine}{Exception}",
         }
-      },
-      {
-        "Name": "Seq",
-        "Args": {
-          "ServerUrl": "http://localhost:9002"
-        }
       }
     ],
     "Properties": {