fix: update decline in a simple way (#639)

* fix: update decline in a simple way

* narrow down auto-update conditions to "all containers missing" and "newly installed"

* add missing return

* fix all containers missing case (2)

* fix ports diff

* status show optional services when they are existed

* fix status

* remove debug prints

Author: reliveyy

images/utils/launcher/__init__.py

@@ -227,12 +227,16 @@ def pre_start(self):
         self.close_other_utils()
 
     def start(self):
+        up_env = True
         try:
-            self.node_manager.update()
+            up_env = self.node_manager.update()
         except ParallelExecutionError:
             pass
-        self.node_manager.up()
-        self.pre_start()
+
+        if up_env:
+            self.node_manager.up()
+            self.pre_start()
+
         self.shell.start(f"{self.config.network} > ", self.handle_command)
 
 

images/utils/launcher/node/DockerTemplate.py

@@ -0,0 +1,15 @@
+import docker
+import docker.errors
+from docker.models.containers import Container
+from typing import Optional
+
+
+class DockerTemplate:
+    def __init__(self):
+        self.client = docker.from_env()
+
+    def get_container(self, name: str) -> Optional[Container]:
+        try:
+            return self.client.containers.get(name)
+        except docker.errors.NotFound:
+            return None

images/utils/launcher/node/__init__.py

@@ -21,6 +21,7 @@
 from .lnd import Lndbtc, Lndltc
 from .webui import Webui
 from .xud import Xud, XudApiError
+from .DockerTemplate import DockerTemplate
 from ..config import Config
 from ..errors import FatalError
 from ..shell import Shell
@@ -125,6 +126,8 @@ def __init__(self, config, shell):
         self.cmd_stop = StopCommand(self.get_node, self.shell)
         self.cmd_restart = RestartCommand(self.get_node, self.shell)
 
+        self.docker_template = DockerTemplate()
+
     @property
     def network_name(self):
         return self.network + "_default"
@@ -176,7 +179,7 @@ def up(self):
         nodes = self.valid_nodes.values()
 
         def print_failed(failed):
-            print("Failed to start these nodes.")
+            print("Failed to start these services:")
             for f in failed:
                 print(f"- {f[0].name}: {str(f[1])}")
 
@@ -219,11 +222,12 @@ def _readable_details(self, details):
         diff_keys = [key for key, value in details.items() if not value.same]
         return ", ".join(diff_keys)
 
-    def update(self):
+    def update(self) -> bool:
         if self.config.disable_update:
-            return
+            return True
 
         outdated = False
+        image_outdated = False
 
         # Step 1. check all images
         print("🌍 Checking for updates...")
@@ -237,6 +241,7 @@ def update(self):
             if status in ["LOCAL_MISSING", "LOCAL_OUTDATED"]:
                 print("- Image %s: %s" % (image.name, image.status_message))
                 outdated = True
+                image_outdated = True
             elif status == "UNAVAILABLE":
                 all_unavailable_images = [x for x in images if x.status == "UNAVAILABLE"]
                 raise FatalError("Image(s) not available: %r" % all_unavailable_images)
@@ -277,12 +282,18 @@ def handle_result(container, result):
 
         if not outdated:
             print("All up-to-date.")
-            return
+            return True
 
         all_containers_missing = functools.reduce(lambda a, b: a and b[0] in ["missing", "external", "disabled"], container_check_result.values(), True)
 
         if all_containers_missing:
-            answer = "yes"
+            if self.newly_installed:
+                answer = "yes"
+            else:
+                if image_outdated:
+                    answer = "yes"
+                else:
+                    return True  # FIXME unintended containers (configuration) update
         else:
             answer = self.shell.yes_or_no("A new version is available. Would you like to upgrade (Warning: this may restart your environment and cancel all open orders)?")
 
@@ -297,6 +308,9 @@ def handle_result(container, result):
             # 2.2) recreate outdated containers
             for container, result in container_check_result.items():
                 container.update(result)
+            return True
+        else:
+            return False
 
     def logs(self, *args):
         self.cmd_logs.execute(args)
@@ -313,9 +327,21 @@ def restart(self, *args):
     def cli(self, name, *args):
         self.get_node(name).cli(" ".join(args), self.shell)
 
+    def _get_status_nodes(self):
+        optional_nodes = ["arby", "boltz", "webui"]
+        result = {}
+        for node in self.nodes.values():
+            if node.name in optional_nodes:
+                c = self.docker_template.get_container(node.container_name)
+                if c:
+                    result[node.name] = node
+            else:
+                result[node.name] = node
+        return result
+
     def status(self):
         # TODO migrate to ServiceTable
-        nodes = self.enabled_nodes
+        nodes = self._get_status_nodes()
         names = list(nodes)
 
         BRIGHT_BLACK = "\033[90m"

images/utils/launcher/node/base.py

@@ -390,10 +390,24 @@ def compare_volumes(self, container: Container) -> CompareResult:
             return CompareResult(False, "Volumes are different", old, new)
         return CompareResult(True, "", old, new)
 
+    def _normalize_docker_port_bindings(self, port_bindings):
+        result = []
+        for key, value in port_bindings.items():
+            if value:
+                mapping = []
+                for p in value:
+                    host_ip = p["HostIp"]
+                    if host_ip == "":
+                        host_ip = "0.0.0.0"
+                    host_port = p["HostPort"]
+                    mapping.append(host_ip + ":" + host_port)
+                result.append(key + "-" + ",".join(mapping))
+        return result
+
     def compare_ports(self, container: Container) -> CompareResult:
         attrs = container.attrs
-        ports = attrs["NetworkSettings"]["Ports"]
-        old_ports = [key + "-" + ",".join([p["HostIp"] + ":" + p["HostPort"] for p in value]) for key, value in ports.items() if value is not None]
+        port_bindings = attrs["HostConfig"]["PortBindings"]
+        old_ports = self._normalize_docker_port_bindings(port_bindings)
 
         def normalize(value):
             if isinstance(value, int):