Upd ver

lib/docker.py

@@ -74,17 +74,24 @@ async def version(cls) -> Tuple[int, int, int]:
 
     @classmethod
     async def pull_and_update(cls):
-        services = await cls.services()
+        services = await cls.services(all_services=True)
         services = set(services)
-        services.remove('rapp')
+        for service_name in ('rapp', 'watchtower', 'socat'):
+            try:
+                services.remove(service_name)
+            except KeyError:
+                pass
         services = ' '.join(services)
         async with cls.lock:
             await cls._run(f'{COMPOSE_CMD} pull {services}')
             await cls._run(f'{COMPOSE_CMD} up -d {services} --remove-orphans')
 
     @classmethod
-    async def services(cls, running: bool = False) -> List[str]:
-        status = ' --status running' if running else ''
+    async def services(cls,
+                       running: bool = False,
+                       all_services: bool = False) -> List[str]:
+        status = ' --status running' if running else (
+            ' --all' if all_services else '')
         async with cls.lock:
             out, _ = await cls._run(
                 f'{COMPOSE_CMD}  ps --services{status}')

lib/envvars.py

@@ -7,5 +7,4 @@
 CONFIG_FILE = os.getenv('CONFIG_FILE', '/config/infrasonar.yaml')
 COMPOSE_PATH = os.path.dirname(COMPOSE_FILE)
 USE_DEVELOPMENT = bool(int(os.getenv('USE_DEVELOPMENT', '0')))
-PROJECT_NAME = os.getenv('PROJECT_NAME', 'infrasonar')
-COMPOSE_CMD = f'docker compose -p {PROJECT_NAME} --progress plain'
+COMPOSE_CMD = 'docker compose --progress plain'

lib/state.py

@@ -577,3 +577,11 @@ def init(cls):
         # Test docker version
         docker_version = cls.loop.run_until_complete(Docker.version())
         logging.info(f'docker version: {docker_version}')
+
+        # Test docker mount (no services found when path does not match)
+        services = cls.loop.run_until_complete(Docker.services())
+        if not services:
+            raise Exception(
+                'no docker services found; most likely the docker mount '
+                'does not reflect the path running on the host; make sure to '
+                'verify the COMPOSE_FILE matches the path on the host')

lib/version.py

@@ -1 +1 @@
-__version__ = '0.1.0-alpha5'
+__version__ = '0.1.0-alpha6'