chore(docker): move networking configuration down one level

docker/etc/dnsmasq/dnsmasq.conf

@@ -1,7 +1,9 @@
 port=53
 
-# Using dnsmasq only for DNS resolution, not its DHCP server.
+bind-interfaces
-no-dhcp-interface=eth0
+
+# Bind to default Docker bridge
+listen-address=172.17.0.1
 
 # If you don't want dnsmasq to read /etc/hosts, uncomment the following line.
 no-hosts
@@ -34,8 +36,11 @@ proxy-dnssec
 user=dnsmasq
 group=nogroup
 
-bind-interfaces
 log-queries
+cache-size=10000
+
+server=9.9.9.9
+server=1.1.1.1
 
 # Include all files in a directory which end in .conf
 conf-dir=/etc/dnsmasq.d/,*.conf

docker/etc/traefik/traefik.yml

@@ -0,0 +1,19 @@
+providers:
+  docker:
+    exposedByDefault: "false"
+
+api:
+  insecure: true
+
+tls:
+  certificates:
+    - certFile: /ssl/traefik.crt
+      keyFile: /ssl/traefik.key
+
+entryPoints:
+  traefik:
+    address: "172.17.0.1:8008"
+  web:
+    address: "172.17.0.1:80"
+  webs:
+    address: "172.17.0.1:443"

docker/traefik.toml

@@ -1,26 +0,0 @@
-defaultEntryPoints = ["http", "https"]
-[accessLog]
-################################################################
-# Web configuration backend
-################################################################
-[web]
-address = ":8040"
-################################################################
-# Docker configuration backend
-################################################################
-[docker]
-domain = "funkwhale.test"
-watch = true
-exposedbydefault = false
-
-[entryPoints]
-  [entryPoints.http]
-  address = ":80"
-    # [entryPoints.http.redirect]
-    entryPoint = "http"
-  [entryPoints.https]
-  address = ":443"
-    [entryPoints.https.tls]
-      [[entryPoints.https.tls.certificates]]
-      certFile = "/ssl/traefik.crt"
-      keyFile = "/ssl/traefik.key"