Implement barebones update strategy for running apps

Author: pmarino90

lib/makina/applications.ex

@@ -85,12 +85,47 @@ defmodule Makina.Applications do
     end
   end
 
+  def update_application(%Server{} = server, %Application{} = app) do
+    if Server.connected?(server) do
+      do_update(server, app)
+    else
+      connect_and_update(server, app)
+    end
+  end
+
+  def do_update(%Server{} = server, %Application{} = app) do
+    IO.puts(" Updating \"#{app.name}\"")
+
+    # rename current app to {name}__stale
+    with {:ok, _} <- mark_app_as_stale(server, app),
+         {:ok, _} <- do_deploy(server, app),
+         {:ok, _} <- stop_stale_app(server, app) do
+      {:ok, :updated}
+    end
+  end
+
+  def connect_and_update(%Server{} = server, %Application{} = app) do
+    server = Servers.connect_to_server(server)
+    result = do_update(server, app)
+    Servers.disconnect_from_server(server)
+
+    result
+  end
+
   defp do_stop(%Server{} = server, %Application{} = app) do
     IO.puts(" Stopping \"#{app.name}\"")
 
     Docker.stop(server, app) |> SSH.execute()
   end
 
+  defp mark_app_as_stale(%Server{} = server, %Application{} = app) do
+    Docker.rename_container(server, app, suffix: "__stale") |> SSH.execute()
+  end
+
+  defp stop_stale_app(%Server{} = server, %Application{} = app) do
+    Docker.stop(server, "#{Docker.app_name(app)}__stale") |> SSH.execute()
+  end
+
   defp connect_and_stop(%Server{} = server, %Application{} = app) do
     server = Servers.connect_to_server(server)
     result = do_stop(server, app)
@@ -118,7 +153,7 @@ defmodule Makina.Applications do
     else
       {:ok, _container} ->
         Logger.debug("A version of #{app.name} is already running, skipping.")
-        {:ok, :skipping}
+        do_update(server, app)
 
       {:error, reason} ->
         {:error, reason}

lib/makina/docker.ex

@@ -79,11 +79,23 @@ defmodule Makina.Docker do
     docker(server, "stop", [app_name(app)])
   end
 
-  defp app_name(%Application{__scope__: []} = app) do
+  def stop(%Server{} = server, name) when is_binary(name) do
+    docker(server, "stop", [name])
+  end
+
+  @rename_container_opts [suffix: [type: :string, required: true]]
+
+  def rename_container(%Server{} = server, %Application{} = app, opts) do
+    opts = NimbleOptions.validate!(opts, @rename_container_opts)
+
+    docker(server, "rename", [app_name(app), app_name(app) <> opts[:suffix]])
+  end
+
+  def app_name(%Application{__scope__: []} = app) do
     app.name
   end
 
-  defp app_name(%Application{} = app) do
+  def app_name(%Application{} = app) do
     app.__scope__ |> Enum.reverse() |> Enum.join("_")
   end
 

lib/makina/servers.ex

@@ -90,11 +90,15 @@ defmodule Makina.Servers do
     })
   end
 
+  defp expose_https_ports(app, nil) do
+    app
+  end
+
   defp expose_https_ports(app, %ProxyConfig{https_enabled: https}) when not is_nil(https) do
     Application.put_exposed_port(app, internal: 443, external: 443)
   end
 
-  defp put_https_command_args(command, %ProxyConfig{https_enabled: nil} = _config) do
+  defp put_https_command_args(command, nil) do
     command
   end
 

mix.exs

@@ -4,7 +4,7 @@ defmodule Makina.MixProject do
   def project do
     [
       app: :makina,
-      version: "0.1.11",
+      version: "0.1.15",
       elixir: "~> 1.18",
       start_permanent: Mix.env() == :prod,
       deps: deps(),

test/makina/models/docker_test.exs

@@ -168,6 +168,18 @@ defmodule Makina.Models.DockerTest do
 
       assert cmd.cmd == "docker stop makina_app_foo"
     end
+
+    test "returns the command to stop an arbitrary container given a name" do
+      server =
+        Server.new(host: "example.com")
+        |> Server.put_private(:conn_ref, self())
+
+      cmd = Docker.stop(server, "foo_bar")
+
+      assert is_struct(cmd, Command)
+
+      assert cmd.cmd == "docker stop foo_bar"
+    end
   end
 
   describe "login/2" do
@@ -217,6 +229,22 @@ defmodule Makina.Models.DockerTest do
     end
   end
 
+  describe "rename_container/3" do
+    test "returns the command to rename an app's container adding a suffix" do
+      app = basic_app_without_scope()
+
+      server =
+        Server.new(host: "example.com")
+        |> Server.put_private(:conn_ref, self())
+
+      cmd = Docker.rename_container(server, app, suffix: "__stale")
+
+      assert is_struct(cmd, Command)
+
+      assert cmd.cmd == "docker rename foo foo__stale"
+    end
+  end
+
   defp basic_app_without_scope() do
     Application.new(name: "foo")
   end