holado 0.6.2__tar.gz → 0.6.4__tar.gz

{holado-0.6.2 → holado-0.6.4}/.gitlab-ci.yml

@@ -1,7 +1,8 @@
 stages:
   - publish-holado-dockerhub
-  - publish-docker-controller-dockerhub
   - publish-holado-gitlab
+  - publish-docker-controller-dockerhub
+  - publish-docker-viewer-dockerhub
 #  - publish-holado-pypi
 
 variables:
@@ -64,6 +65,7 @@ publish-docker-controller-dockerhub-latest:
     - if: $CI_COMMIT_TAG
       when: never
     - if: $CI_COMMIT_BRANCH == "main"
+  when: manual
 
 publish-docker-controller-dockerhub-tag:
   stage: publish-docker-controller-dockerhub
@@ -81,6 +83,46 @@ publish-docker-controller-dockerhub-tag:
   
   rules:
     - if: $CI_COMMIT_TAG
+  when: manual
+
+
+publish-docker-viewer-dockerhub-latest:
+  stage: publish-docker-viewer-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/docker_viewer:latest
+
+  script:
+    - docker build ./src/holado_docker/tools/docker_viewer/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: never
+    - if: $CI_COMMIT_BRANCH == "main"
+  when: manual
+
+publish-docker-viewer-dockerhub-tag:
+  stage: publish-docker-viewer-dockerhub
+
+  image:
+    name: docker:${DOCKER_IMAGE_TAG}
+    
+  variables:
+    IMAGE_TAG: index.docker.io/holado/docker_viewer:$CI_COMMIT_TAG
+
+  script:
+    - docker build ./src/holado_docker/tools/docker_viewer/server/ -t ${IMAGE_TAG}
+    - echo "$DOCKERHUB_TOKEN" | docker login docker.io -u holado --password-stdin
+    - docker push ${IMAGE_TAG}
+  
+  rules:
+    - if: $CI_COMMIT_TAG
+  when: manual
 
 
 publish-holado-gitlab:

{holado-0.6.2 → holado-0.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: holado
-Version: 0.6.2
+Version: 0.6.4
 Summary: HolAdo framework
 Project-URL: Homepage, https://gitlab.com/holado_framework/python
 Project-URL: Issues, https://gitlab.com/holado_framework/python/-/issues
@@ -20,6 +20,38 @@ Requires-Dist: psutil
 Requires-Dist: python-dateutil
 Provides-Extra: ais
 Requires-Dist: pyais; extra == 'ais'
+Provides-Extra: all
+Requires-Dist: boto3; extra == 'all'
+Requires-Dist: certifi; extra == 'all'
+Requires-Dist: connexion[flask,swagger-ui,uvicorn]; extra == 'all'
+Requires-Dist: docker; extra == 'all'
+Requires-Dist: flask; extra == 'all'
+Requires-Dist: flask-cors; extra == 'all'
+Requires-Dist: google; extra == 'all'
+Requires-Dist: google-api-core; extra == 'all'
+Requires-Dist: grpc-requests; extra == 'all'
+Requires-Dist: grpcio; extra == 'all'
+Requires-Dist: grpcio-reflection; extra == 'all'
+Requires-Dist: grpcio-tools; extra == 'all'
+Requires-Dist: minio; extra == 'all'
+Requires-Dist: moto; extra == 'all'
+Requires-Dist: paramiko<4.0.0; extra == 'all'
+Requires-Dist: pika; extra == 'all'
+Requires-Dist: protobuf; extra == 'all'
+Requires-Dist: psycopg; extra == 'all'
+Requires-Dist: psycopg-binary; extra == 'all'
+Requires-Dist: pyais; extra == 'all'
+Requires-Dist: pympler; extra == 'all'
+Requires-Dist: pyopenssl; extra == 'all'
+Requires-Dist: pypika; extra == 'all'
+Requires-Dist: pysftp; extra == 'all'
+Requires-Dist: pyyaml; extra == 'all'
+Requires-Dist: redis; extra == 'all'
+Requires-Dist: redis-om; extra == 'all'
+Requires-Dist: sftpserver; extra == 'all'
+Requires-Dist: sql-metadata; extra == 'all'
+Requires-Dist: truststore; extra == 'all'
+Requires-Dist: zeep; extra == 'all'
 Provides-Extra: api-connexion
 Requires-Dist: connexion[flask,swagger-ui,uvicorn]; extra == 'api-connexion'
 Provides-Extra: db
@@ -28,8 +60,13 @@ Requires-Dist: sql-metadata; extra == 'db'
 Provides-Extra: db-postgresql
 Requires-Dist: psycopg; extra == 'db-postgresql'
 Requires-Dist: psycopg-binary; extra == 'db-postgresql'
+Requires-Dist: pypika; extra == 'db-postgresql'
+Requires-Dist: sql-metadata; extra == 'db-postgresql'
 Provides-Extra: docker
 Requires-Dist: docker; extra == 'docker'
+Provides-Extra: docker-tools
+Requires-Dist: connexion[flask,swagger-ui,uvicorn]; extra == 'docker-tools'
+Requires-Dist: docker; extra == 'docker-tools'
 Provides-Extra: grpc
 Requires-Dist: google; extra == 'grpc'
 Requires-Dist: google-api-core; extra == 'grpc'
@@ -56,8 +93,12 @@ Requires-Dist: flask-cors; extra == 's3'
 Requires-Dist: minio; extra == 's3'
 Requires-Dist: moto; extra == 's3'
 Provides-Extra: sftp
+Requires-Dist: certifi; extra == 'sftp'
+Requires-Dist: paramiko<4.0.0; extra == 'sftp'
+Requires-Dist: pyopenssl; extra == 'sftp'
 Requires-Dist: pysftp; extra == 'sftp'
 Requires-Dist: sftpserver; extra == 'sftp'
+Requires-Dist: truststore; extra == 'sftp'
 Provides-Extra: ssl
 Requires-Dist: certifi; extra == 'ssl'
 Requires-Dist: pyopenssl; extra == 'ssl'

holado-0.6.4/packaging/VERSION

@@ -0,0 +1 @@
+0.6.4

{holado-0.6.2 → holado-0.6.4}/pyproject.toml

@@ -33,18 +33,22 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
+all = ["holado[ais]", "holado[api-connexion]", "holado[db]", "holado[db-postgresql]", "holado[docker]", "holado[docker-tools]", 
+       "holado[helper_debug]", "holado[protobuf]", "holado[grpc]", "holado[rabbitmq]", "holado[redis]", 
+       "holado[s3]", "holado[sftp]", "holado[ssl]", "holado[ws-zeep]", "holado[yaml]" ]
 ais = ["pyais"]
 api-connexion = ["connexion[flask,swagger-ui,uvicorn]"]
 db = ["pypika", "sql_metadata"]
-db-postgresql = ["psycopg", "psycopg_binary"]
+db-postgresql = ["holado[db]", "psycopg", "psycopg_binary"]
 docker = ["docker"]
+docker-tools = ["holado[docker]", "holado[api-connexion]"]
 helper_debug = ["pympler"]
-protobuf = ["google", "google-api-core", "protobuf"]
 grpc = ["holado[protobuf]", "grpc_requests", "grpcio", "grpcio-reflection", "grpcio-tools"]
+protobuf = ["google", "google-api-core", "protobuf"]
 rabbitmq = ["pika"]
 redis = ["redis", "redis-om"]
 s3 = ["minio", "boto3", "moto", "flask", "flask_cors"]
-sftp = ["pysftp", "sftpserver"]
+sftp = ["holado[ssl]", "paramiko<4.0.0", "pysftp", "sftpserver"]
 ssl = ["truststore", "certifi", "pyOpenSSL"]
 ws-suds = ["suds"]
 ws-zeep = ["zeep"]
@@ -60,7 +64,8 @@ pattern = "(?P<version>[\\w.]+)"
 
 [tool.hatch.build.targets.wheel]
 packages = ["src/holado", "src/holado_ais", "src/holado_binary", "src/holado_context", "src/holado_core", 
-    "src/holado_data", "src/holado_db", "src/holado_django", "src/holado_docker", "src/holado_grpc", "src/holado_helper", "src/holado_json", 
+    "src/holado_crypto", "src/holado_data", "src/holado_db", "src/holado_django", "src/holado_docker", "src/holado_examples", 
+    "src/holado_grpc", "src/holado_helper", "src/holado_json", 
     "src/holado_keycloak", "src/holado_logging", "src/holado_multitask", "src/holado_protobuf", "src/holado_python", 
     "src/holado_rabbitmq", "src/holado_redis", "src/holado_report", "src/holado_rest", "src/holado_s3", 
     "src/holado_scripting", "src/holado_sftp", "src/holado_swagger", "src/holado_system", "src/holado_test", 

{holado-0.6.2 → holado-0.6.4}/requirements_docker.txt

@@ -41,6 +41,7 @@ djangogrpcframework
 
 # For sftp
 pysftp
+paramiko<4.0.0
 sftpserver
 
 # For S3 module

{holado-0.6.2 → holado-0.6.4}/src/holado/__init__.py

@@ -209,8 +209,8 @@ def __import_modules(module_names):
         except Exception as exc:
             if Tools.do_log(logger, logging.DEBUG):
                 logger.debug(f"Failed to import HolAdo module '{module_name}':\n{Tools.represent_exception(exc)}")
-            logger.warning(f"Failed to import HolAdo module '{module_name}': {str(exc)} (see debug logs for more details)")
-            pass
+            if "No module named" not in str(exc):
+                logger.warning(f"Failed to import HolAdo module '{module_name}': {str(exc)} (see debug logs for more details)")
         else:
             if Tools.do_log(logger, logging.DEBUG):
                 logger.debug(f"Imported HolAdo module '{module_name}'")

{holado-0.6.2 → holado-0.6.4}/src/holado/common/handlers/object.py

@@ -62,9 +62,20 @@ class DeleteableObject(Object):
         
         self.__on_delete_funcs = []
         self.__on_delete_gc_collect = False
+        self.__is_deleteable = True
+    
+    @property
+    def _is_deleteable(self):
+        return self.__is_deleteable
+    
+    @_is_deleteable.setter
+    def _is_deleteable(self, is_deleteable):
+        self.__is_deleteable = is_deleteable
     
     def __del__(self):
         try:
+            if not self._is_deleteable:
+                return
             if self.object_state in [ObjectStates.Deleting, ObjectStates.Deleted]:
                 return
             
@@ -83,7 +94,8 @@ class DeleteableObject(Object):
                 self.__delete()
             else:
                 from holado_multitask.multithreading.functionthreaded import FunctionThreaded
-                func = FunctionThreaded(self.__delete, name=f"delete object '{self.name}'", register_thread=False)
+                func = FunctionThreaded(self.__delete, name=f"delete object '{self.name}'", register_thread=False, do_log=False)
+                func._is_deleteable = False      # Deactivate deletion mechanism of DeleteableObject to avoid an infinite loop
                 func.start()
                 func.join(timeout=30, raise_if_still_alive=False)   # timeout of 30s to limit deadlock impact ; raise to False since exceptions are omitted in gc collect context
         except AttributeError as exc:
@@ -124,6 +136,8 @@ class DeleteableObject(Object):
         from holado_core.common.tools.tools import Tools
         from holado_python.standard_library.typing import Typing
         
+        if not self._is_deleteable:
+            return
         if self.object_state in [ObjectStates.Deleting, ObjectStates.Deleted]:
             return False
         

{holado-0.6.2 → holado-0.6.4}/src/holado_ais/ais/ais_messages.py

@@ -40,7 +40,9 @@ except Exception as exc:
     if Tools.do_log(logger, logging.DEBUG):
         logger.debug(f"AIS is not available. Initialization failed on error: {exc}")
     with_pyais = False
-
+# else:
+#     if Tools.do_log(logger, logging.DEBUG):
+#         logger.debug(f"AIS is available !")
 
 
 class AISMessages(object):

{holado-0.6.2 → holado-0.6.4}/src/holado_docker/sdk/docker/docker_client.py

@@ -43,10 +43,10 @@ class DockerClient(object):
     def client(self):
         return self.__client
     
-    def has_container(self, name, in_list=True, reset_if_removed=True):
+    def has_container(self, name, in_list=True, all_=False, reset_if_removed=True):
         # Note: Even if name exists in __containers, it is possible that the container has been removed
         if in_list:
-            c = self.__get_container_from_list(name)
+            c = self.__get_container_from_list(name, all_=all_)
             res = c is not None
             
             if reset_if_removed and not res and name in self.__containers:
@@ -60,7 +60,7 @@ class DockerClient(object):
                 res = False
         return res
     
-    def get_container(self, name, reset_if_removed=True):
+    def get_container(self, name, all_=False, reset_if_removed=True):
         # Reset container if removed
         if reset_if_removed and name in self.__containers:
             if self.__containers[name].status == "removed":
@@ -68,16 +68,16 @@ class DockerClient(object):
         
         # Get container from list if needed
         if name not in self.__containers:
-            c = self.__get_container_from_list(name)
+            c = self.__get_container_from_list(name, all_=all_)
             if c:
                 self.__containers[name] = DockerContainer(self, c)
         
         return self.__containers.get(name)
     
-    def update_containers(self, reset_if_removed=True):
+    def update_containers(self, all_=False, sparse=False, reset_if_removed=True):
         # Add new containers
         updated_names = set()
-        for c in self.__client.containers.list(all=True, sparse=True, ignore_removed=True):
+        for c in self.__client.containers.list(all=all_, sparse=sparse, ignore_removed=True):
             try:
                 c_name = c.name
             except docker.errors.NotFound:
@@ -92,21 +92,24 @@ class DockerClient(object):
             for name in set(self.__containers.keys()).difference(updated_names):
                 del self.__containers[name]
     
-    def get_all_container_names(self):
-        res = []
-        for c in self.__client.containers.list(all=True, sparse=True, ignore_removed=True):
-            try:
-                c_name = c.name
-            except docker.errors.NotFound:
-                # Container 'c' doesn't exist anymore
-                continue
-            
-            res.append(c_name)
+    def get_container_names(self, in_list=True, all_=False, sparse=False):
+        if in_list:
+            res = []
+            for c in self.__client.containers.list(all=all_, sparse=sparse, ignore_removed=True):
+                try:
+                    c_name = c.name
+                except docker.errors.NotFound:
+                    # Container 'c' doesn't exist anymore
+                    continue
+                
+                res.append(c_name)
+        else:
+            res = list(self.__containers.keys())
         return res
     
-    def __get_container_from_list(self, name):
+    def __get_container_from_list(self, name, all_=False):
         res = None
-        for c in self.__client.containers.list(all=True, ignore_removed=True):
+        for c in self.__client.containers.list(all=all_, ignore_removed=True):
             try:
                 c_name = c.name
             except docker.errors.NotFound:
@@ -205,7 +208,7 @@ class DockerClient(object):
     def start_container(self, name, wait_running=True, **kwargs):
         if Tools.do_log(logger, logging.DEBUG):
             logger.debug(f"Starting docker container '{name}' with arguments {kwargs}{', and waiting running status' if wait_running else ''}")
-        container = self.get_container(name)
+        container = self.get_container(name, all_=True)
         if not container:
             raise FunctionalException("Container of name '{}' doesn't exist")
         
@@ -245,13 +248,14 @@ class DockerClient(object):
     def remove_container(self, name):
         if Tools.do_log(logger, logging.DEBUG):
             logger.debug(f"Removing docker container of name '{name}'")
-        if not self.has_container(name):
+        if not self.has_container(name, in_list=True, all_=True):
             raise FunctionalException(f"Container of name '{name}' doesn't exist")
         
-        del self.__containers[name]
+        if name in self.__containers:
+            del self.__containers[name]
         self.client.api.remove_container(name)
         
-        if self.has_container(name):
+        if self.has_container(name, in_list=True, all_=True):
             raise FunctionalException(f"Failed to remove container of name '{name}'")
         else:
             if Tools.do_log(logger, logging.DEBUG):

{holado-0.6.2 → holado-0.6.4}/src/holado_docker/tools/docker_controller/client/rest/docker_controller_client.py

@@ -22,12 +22,18 @@ class DockerControllerClient(RestClient):
     def __init__(self, name, url, headers=None):
         super().__init__(name, url, headers)
     
-    def get_containers_status(self):
-        response = self.get("container")
+    def get_containers_status(self, all_=False):
+        if all_:
+            response = self.get("container?all=true")
+        else:
+            response = self.get("container")
         return self.response_result(response, status_ok=[200,204])
     
-    def get_container_info(self, name):
-        response = self.get(f"container/{name}")
+    def get_container_info(self, name, all_=False):
+        if all_:
+            response = self.get(f"container/{name}?all=true")
+        else:
+            response = self.get(f"container/{name}")
         return self.response_result(response, status_ok=[200,204])
     
     def restart_container(self, name):

{holado-0.6.2 → holado-0.6.4}/src/holado_docker/tools/docker_controller/docker_controller_manager.py

@@ -16,6 +16,7 @@ from holado_core.common.tools.converters.converter import Converter
 import os
 from holado_docker.tools.docker_controller.client.rest.docker_controller_client import DockerControllerClient
 from holado_rest.api.rest.rest_manager import RestManager
+from holado.common.handlers.undefined import undefined_argument
 
 logger = logging.getLogger(__name__)
 
@@ -23,12 +24,13 @@ logger = logging.getLogger(__name__)
 class DockerControllerManager(object):
     
     @classmethod
-    def new_client(cls, **kwargs):
+    def new_client(cls, use_localhost=undefined_argument, **kwargs):
         if 'name' not in kwargs:
             kwargs['name'] = None
         if 'url' not in kwargs:
-            env_use = os.getenv("HOLADO_USE_LOCALHOST", False)
-            use_localhost = Converter.is_boolean(env_use) and Converter.to_boolean(env_use)
+            if use_localhost is undefined_argument:
+                env_use = os.getenv("HOLADO_USE_LOCALHOST", False)
+                use_localhost = Converter.is_boolean(env_use) and Converter.to_boolean(env_use)
             
             host = "localhost" if use_localhost else os.getenv("HOLADO_DOCKER_CONTROLLER_NAME", "holado_docker_controller")
             port = os.getenv("HOLADO_DOCKER_CONTROLLER_PORT", 8000)

{holado-0.6.2 → holado-0.6.4}/src/holado_docker/tools/docker_controller/server/Dockerfile

@@ -1,6 +1,7 @@
 ### Build
 
-FROM python:3.12.9-alpine3.21 AS build
+#FROM python:3.12.9-alpine3.21 AS build
+FROM python:3.12.11-alpine3.22 AS build
 
 # Install to build python requirements
 RUN apk update \
@@ -27,8 +28,8 @@ RUN mkdir /code \
 USER appuser
 
 # Create python venv and install requirements
-COPY --chown=appuser ./requirements.txt /code/docker_controler/requirements.txt
-WORKDIR /code/docker_controler
+COPY --chown=appuser ./requirements.txt /code/docker_controller/requirements.txt
+WORKDIR /code/docker_controller
 RUN python -m venv /code/env \
     && source /code/env/bin/activate \
     && pip install -r requirements.txt
@@ -37,7 +38,8 @@ RUN python -m venv /code/env \
 
 ### Runtime
 
-FROM python:3.12.9-alpine3.21 AS runtime
+#FROM python:3.12.9-alpine3.21 AS runtime
+FROM python:3.12.11-alpine3.22 AS runtime
 
 # Install for python requirements
 #RUN apk update \
@@ -57,12 +59,12 @@ USER appuser
 # Copy /code from build
 COPY --chown=appuser --from=build /code /code
 
-# Copy docker controler sources
-COPY --chown=appuser ./rest /code/docker_controler
+# Copy docker controller sources
+COPY --chown=appuser ./rest /code/docker_controller
 
 # Activate permanently python venv
 ENV PATH=/code/env/bin:$PATH
 
-WORKDIR /code/docker_controler
+WORKDIR /code/docker_controller
 CMD ["sh", "-c", "uvicorn run:app --host 0.0.0.0 --port $HOLADO_DOCKER_CONTROLLER_PORT"]
 

holado-0.6.4/src/holado_docker/tools/docker_controller/server/requirements.txt

@@ -0,0 +1,2 @@
+# HolAdo framework
+holado[api-connexion,docker,ssl,yaml]

holado-0.6.4/src/holado_docker/tools/docker_controller/server/rest/README

@@ -0,0 +1,2 @@
+REST API specification is described in openapi.yaml.
+If Docker Controller is running, the specification can be displayed with path /ui (ex: http://127.0.0.1:8000/ui).

{holado-0.6.2 → holado-0.6.4}/src/holado_docker/tools/docker_controller/server/rest/api/__init__.py

@@ -12,30 +12,29 @@
 
 from flask.views import MethodView
 from holado.common.context.session_context import SessionContext
+import logging
+
+logger = logging.getLogger(__name__)
+
+
 
 def _get_session_context():
     return SessionContext.instance()
 
 class ContainerView(MethodView):
     
-    # def post(self, body: dict):
-    #     pass
-    #
-    # def put(self, container_name, body: dict):
-    #     pass
-    #
-    # def delete(self, container_name):
-    #     pass
-    
-    def get(self, name=None, limit=100):
+    def get(self, name=None, all_=False, limit=100):
+        _get_session_context().docker_client.update_containers(all_=all_)
         if name is not None:
-            if not _get_session_context().docker_client.has_container(name):
-                return f"Container '{name}' doesn't exist", 406
+            if not _get_session_context().docker_client.has_container(name, in_list=False, all_=all_, reset_if_removed=False):
+                if all_:
+                    return f"Container '{name}' doesn't exist", 406
+                else:
+                    return f"Container '{name}' is not running (try with '?all=true' to get information on existing but not running containers)", 406
             
-            cont = _get_session_context().docker_client.get_container(name)
-            cont.container.reload()
-            res = cont.container.attrs
+            cont = _get_session_context().docker_client.get_container(name, all_=all_)
+            res = cont.information
         else:
-            names = _get_session_context().docker_client.get_all_container_names()
-            res = [{'name':n, 'status':_get_session_context().docker_client.get_container(n).status} for n in names]
+            names = _get_session_context().docker_client.get_container_names(in_list=False, all_=all_)
+            res = [{'name':n, 'status':_get_session_context().docker_client.get_container(n, all_=all_).status} for n in names]
         return res

{holado-0.6.2 → holado-0.6.4}/src/holado_docker/tools/docker_controller/server/rest/openapi.yaml

@@ -12,10 +12,16 @@ paths:
   /container:
     get:
       description: "List containers and their status"
-      parameters: []
+      parameters:
+        - in: "query"
+          name: "all"
+          description: "if set to 'true', list all containers, not only running ones"
+          schema:
+            type: "boolean"
+            default: false
       responses:
         200:
-          description: ""
+          description: "List of container names with their status"
           content:
             application/json:
               schema:
@@ -28,12 +34,19 @@ paths:
       parameters:
         - in: "path"
           name: "name"
+          description: "Container name"
           required: true
           schema:
             type: "string"
+        - in: "query"
+          name: "all"
+          description: "if set to 'true', search container in all containers, not only running ones"
+          schema:
+            type: "boolean"
+            default: false
       responses:
         200:
-          description: ""
+          description: "Container information"
           content:
             application/json:
               schema:
@@ -44,6 +57,7 @@ paths:
       parameters:
         - in: "path"
           name: "name"
+          description: "Container name"
           required: true
           schema:
             type: "string"
@@ -66,6 +80,7 @@ paths:
       parameters:
         - in: "path"
           name: "name"
+          description: "Container name"
           required: true
           schema:
             type: "string"
@@ -88,6 +103,7 @@ paths:
       parameters:
         - in: "path"
           name: "name"
+          description: "Container name"
           required: true
           schema:
             type: "string"
@@ -110,6 +126,7 @@ paths:
       parameters:
         - in: "path"
           name: "name"
+          description: "Container name"
           required: true
           schema:
             type: "string"

{holado-0.6.2 → holado-0.6.4}/src/holado_docker/tools/docker_controller/server/run_docker_controller_in_docker.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Script to launch Docker Controler as a docker image.
+# Script to launch Docker Controller as a docker image.
 # 
-# Docker Controler exposes a REST API for some docker commands.
+# Docker Controller exposes a REST API for some docker commands.
 # It is accessible on localhost, and also on a docker network if HOLADO_NETWORK is defined.
 # On all networks, API is accessible on same port (HOLADO_DOCKER_CONTROLLER_PORT or 8000).
 #
@@ -13,8 +13,8 @@
 #
 #     Optionally, define in .profile the following variables
 #         - HOLADO_DOCKER_CONTROLLER_PORT: REST API port to use (default: 8000)
-#         - HOLADO_IMAGE_REGISTRY: docker image registry to use (default: holado/docker_controler)
-#         - HOLADO_IMAGE_TAG: docker image tag to use (default: main)
+#         - HOLADO_IMAGE_REGISTRY: docker image registry to use (default: holado/docker_controller)
+#         - HOLADO_IMAGE_TAG: docker image tag to use (default: latest)
 #         - HOLADO_OUTPUT_BASEDIR: absolute path to base output directory (default: [HOME]/.holado/output)
 #         - HOLADO_USE_LOCALHOST: force the container network to 'host'.
 #         - HOLADO_NETWORK: specify on which network the docker is run.
@@ -24,10 +24,10 @@
 WORK_DIR="$(pwd)"
 
 if [[ -z "$HOLADO_IMAGE_REGISTRY" ]]; then
-    HOLADO_IMAGE_REGISTRY=holado/docker_controler
+    HOLADO_IMAGE_REGISTRY=holado/docker_controller
 fi
 if [[ -z "$HOLADO_IMAGE_TAG" ]]; then
-    HOLADO_IMAGE_TAG=main
+    HOLADO_IMAGE_TAG=latest
 fi
 CONTROLLER_IMAGE=${HOLADO_IMAGE_REGISTRY}:${HOLADO_IMAGE_TAG}
 

holado-0.6.4/src/holado_docker/tools/docker_viewer/client/rest/docker_viewer_client.py

@@ -0,0 +1,40 @@
+
+#################################################
+# HolAdo (Holistic Automation do)
+#
+# (C) Copyright 2021-2025 by Eric Klumpp
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+# The Software is provided “as is”, without warranty of any kind, express or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose and noninfringement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability, whether in an action of contract, tort or otherwise, arising from, out of or in connection with the software or the use or other dealings in the Software.
+#################################################
+
+import logging
+from holado_rest.api.rest.rest_client import RestClient
+
+logger = logging.getLogger(__name__)
+
+
+class DockerViewerClient(RestClient):
+    
+    def __init__(self, name, url, headers=None):
+        super().__init__(name, url, headers)
+    
+    def get_containers_status(self, all_=False):
+        if all_:
+            response = self.get("container?all=true")
+        else:
+            response = self.get("container")
+        return self.response_result(response, status_ok=[200,204])
+    
+    def get_container_info(self, name, all_=False):
+        if all_:
+            response = self.get(f"container/{name}?all=true")
+        else:
+            response = self.get(f"container/{name}")
+        return self.response_result(response, status_ok=[200,204])
+    
+    
+