mantis-cli 19.1.5__tar.gz → 19.1.7__tar.gz

{mantis-cli-19.1.5/mantis_cli.egg-info → mantis_cli-19.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 19.1.5
+Version: 19.1.7
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský

mantis_cli-19.1.7/mantis/__init__.py

@@ -0,0 +1 @@
+VERSION = '19.1.7'

{mantis-cli-19.1.5 → mantis_cli-19.1.7}/mantis/helpers.py

@@ -108,5 +108,24 @@ def random_string(n=10):
     chars = string.ascii_lowercase + string.ascii_uppercase + string.digits
     return ''.join(random.choice(chars) for _ in range(n))
 
-
-
+def merge_json(obj1, obj2):
+    # Base case: if both values are dictionaries, merge recursively
+    if isinstance(obj1, dict) and isinstance(obj2, dict):
+        merged = {}
+        for key in obj1.keys() | obj2.keys():  # Union of both sets of keys
+            if key in obj1 and key in obj2:
+                merged[key] = merge_json(obj1[key], obj2[key])
+            elif key in obj1:
+                merged[key] = obj1[key]
+            else:
+                merged[key] = obj2[key]
+        return merged
+    # If both are lists, combine them
+    elif isinstance(obj1, list) and isinstance(obj2, list):
+        return obj1 + obj2
+    # If both values are not dicts or lists, return value from obj2
+    else:
+        if obj1 == obj2:
+            return obj1
+        else:
+            raise ValueError(f'Trying to merge objects: {obj1} and {obj2}')

{mantis-cli-19.1.5 → mantis_cli-19.1.7}/mantis/managers.py

@@ -5,12 +5,12 @@ import yaml
 from collections import defaultdict
 from datetime import datetime
 from os import path
-from os.path import dirname, normpath
+from os.path import normpath
 from time import sleep
 
 from mantis.crypto import Crypto
 from mantis.environment import Environment
-from mantis.helpers import CLI, Colors
+from mantis.helpers import CLI, Colors, merge_json
 from mantis.logic import find_config, load_config, check_config, load_template_config
 
 
@@ -158,6 +158,9 @@ class AbstractManager(object):
         # Remove empty strings
         self.compose_files = list(filter(None, compose_file_paths))
 
+        # Read compose files
+        self.compose_config = self.read_compose_configs()
+
     def check_environment_encryption(self, env_file):
         decrypted_environment = self.decrypt_env(env_file=env_file, return_value=True)  # .env.encrypted
         loaded_environment = self.env.load(env_file)  # .env
@@ -570,7 +573,8 @@ class BaseManager(AbstractManager):
         Checks if given container has defined healthcheck
         """
         healthcheck_config = self.get_healthcheck_config(container)
-        return healthcheck_config and healthcheck_config.get('Test')
+
+        return healthcheck_config and healthcheck_config.get('Test') != ['NONE']
 
     def get_healthcheck_start_period(self, container):
         """
@@ -916,6 +920,8 @@ class BaseManager(AbstractManager):
             CLI.info(f'Renaming new container [{new_container}]...')
             self.docker(f'container rename {new_container} {container_prefix}-{index + 1}')
 
+        self.remove_suffixes(prefix=container_prefix)
+
         # reload webserver
         self.try_to_reload_webserver()
 
@@ -925,18 +931,28 @@ class BaseManager(AbstractManager):
         """
         for service in self.services():
             containers = self.get_service_containers(service)
+
             num_containers = len(containers)
 
             if num_containers != 1:
-                return CLI.info(f'Service {service} has {num_containers} containers. Skipping removing suffixes')
+                CLI.info(f'Service {service} has {num_containers} containers. Skipping removing suffix.')
+                continue
 
             container = containers[0]
 
-            if container.split('-')[-1].isdigit():
-                if container not in self.services():
-                    CLI.info(f'Removing suffix of container {container}')
-                    new_container = container.rsplit('-', maxsplit=1)[0]
-                    self.docker(f'container rename {container} {new_container}')
+            if not container.split('-')[-1].isdigit():
+                continue
+
+            new_container = container.rsplit('-', maxsplit=1)[0]
+            defined_container_name = self.compose_config.get('services', {}).get(service, {}).get('container_name', None)
+
+            if container == defined_container_name:
+                CLI.info(f'Service {service} has defined the same container name ({defined_container_name}). Skipping removing suffix.')
+                continue
+
+            if container not in self.services():
+                CLI.info(f'Removing suffix of container {container}')
+                self.docker(f'container rename {container} {new_container}')
 
     def restart_service(self, service):
         """
@@ -1159,6 +1175,19 @@ class BaseManager(AbstractManager):
 
         return None
 
+    def read_compose_configs(self):
+        """
+        Returns merged compose configs
+        """
+        config = {}
+
+        for compose_file in self.compose_files:
+            with open(compose_file, 'r') as file:
+                compose_data = yaml.safe_load(file)
+                config = merge_json(config, compose_data)
+
+        return config
+
     def get_deploy_replicas(self, service):
         """
         Returns default number of deploy replicas of given services

{mantis-cli-19.1.5 → mantis_cli-19.1.7/mantis_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mantis-cli
-Version: 19.1.5
+Version: 19.1.7
 Summary: Management command to build and deploy webapps, especially based on Django
 Home-page: https://github.com/PragmaticMates/mantis-cli
 Author: Erik Telepovský

mantis-cli-19.1.5/mantis/__init__.py

@@ -1 +0,0 @@
-VERSION = '19.1.5'