Fix service names for services to pull.

Signed-off-by: Jelmer de Wolde <jelmer.de.wolde@alliander.com>

Author: Jelmerdw

conftest.py

@@ -190,10 +190,17 @@ def pull_missing_images() -> None:
         .decode("utf-8")
         .split()
     )
+    services = (
+        subprocess.check_output(
+            f"docker compose -f {COMPOSE_FILE} config --services".split()
+        )
+        .decode("utf-8")
+        .split()
+    )
 
     # Create list of services of which the image needs to be pulled:
     services_to_pull = []
-    for image in images:
+    for image, service in zip(images, services, strict=False):
         try:
             subprocess.check_output(
                 f"docker image inspect {image}".split(),
@@ -203,7 +210,6 @@ def pull_missing_images() -> None:
             cprint(f"Image {image} is already available locally.", "green")
         except subprocess.CalledProcessError:
             cprint(f"Image {image} is not available locally.", "yellow")
-            service = f"alliander_{image.split('/')[-1]}"
             services_to_pull.append(service)
 
     # Pull the missing images:

start.py

@@ -228,7 +228,6 @@ def load_service_base(self, package: str, command: str) -> dict:
         Returns:
             dict: dictionary containing YAML data from docker-compose.yml, with added command.
         """
-        print(f"{package}")
         service = self.load_compose(f"{package}/docker-compose.yml")["services"][
             package
         ]