Add networks to container

At the moment is a private property that is used to ensure
exposed apps are in the same network where the proxy is

Author: pmarino90

lib/makina/docker.ex

@@ -19,6 +19,7 @@ defmodule Makina.Docker do
       name(app),
       labels(app),
       volumes(app),
+      network(app),
       envs(app),
       ports(app),
       image(app),
@@ -33,7 +34,7 @@ defmodule Makina.Docker do
   Prepares the `docker inspect` command for a give container
   """
   def inspect(%Server{} = server, %Application{} = app) do
-    docker(server, "inspect", [app_name(app)], fn
+    docker(server, "inspect", ["--type=container", app_name(app)], fn
       {:ok, result} ->
         info = result[:data] |> String.replace("\n", "") |> JSON.decode!()
 
@@ -110,6 +111,24 @@ defmodule Makina.Docker do
     end)
   end
 
+  defp network(%Application{domains: []} = app) do
+    docker_special_config = app.__docker__
+
+    Map.get(docker_special_config, :networks, [])
+    |> Enum.flat_map(fn n ->
+      ["--network", n]
+    end)
+  end
+
+  defp network(%Application{} = app) do
+    docker_special_config = app.__docker__
+
+    (Map.get(docker_special_config, :networks, []) ++ ["makina-web-net"])
+    |> Enum.flat_map(fn n ->
+      ["--network", n]
+    end)
+  end
+
   defp labels(%Application{} = app) do
     labels = Map.get(app.__docker__, :labels, []) ++ hash_label(app) ++ proxy_labels(app)
 
@@ -149,14 +168,14 @@ defmodule Makina.Docker do
     [
       "traefik.enable=true",
       "traefik.http.middlewares.#{app_name(app)}.compress=true",
-      "traefik.http.routers.foo.rule=Host\\(#{format_domains(domains)}\\)",
+      "traefik.http.routers.#{app_name(app)}.rule=\"#{format_domains(domains)}\"",
       "traefik.http.routers.#{app_name(app)}.tls.certresolver=letsencrypt",
-      "traefik.http.services.foo.loadBalancer.server.port=#{first_exposed_port(app)}"
+      "traefik.http.services.#{app_name(app)}.loadBalancer.server.port=#{first_exposed_port(app)}"
     ]
   end
 
   defp format_domains(domains) when is_list(domains) do
-    domains |> Enum.map_join(",", fn d -> "\\`#{d}\\`" end)
+    domains |> Enum.map_join(" || ", fn d -> "Host(\\`#{d}\\`)" end)
   end
 
   defp first_exposed_port(%Application{exposed_ports: []}) do

lib/makina/models/application.ex

@@ -38,7 +38,8 @@ defmodule Makina.Models.Application do
   defstruct __hash__: nil,
             __docker__: %{
               labels: [],
-              command: []
+              command: [],
+              networks: []
             },
             __scope__: [],
             name: nil,

lib/makina/servers.ex

@@ -64,7 +64,6 @@ defmodule Makina.Servers do
       Application.new(name: "makina-proxy")
       |> Application.set_docker_image(name: "traefik", tag: "v3.3")
       |> Application.put_exposed_port(internal: 80, external: 80)
-      |> Application.put_exposed_port(internal: 8080, external: 8080)
       |> expose_https_ports(proxy_config)
       |> Application.put_volume(
         source: "/var/run/docker.sock",
@@ -84,7 +83,8 @@ defmodule Makina.Servers do
 
     Application.set_private(app, :__docker__, %{
       app.__docker__
-      | command:
+      | networks: [@docker_web_network],
+        command:
           base_command
           |> put_https_command_args(proxy_config)
     })