From 0077d219fbc576eed3af2da23bc320d17a985f55 Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 3 Jun 2024 17:01:43 +0200 Subject: [PATCH] CI DeployObject: don't grep, just give service name With the capabilities now given as part of this MR, it happens that when checking the "docker compose config", the container_name might not be close to the service name. Something like service: cap_drop: ... cap_add: ... container_name: This is inconvenient, as the previous grep for the service name + 3 lines might not cover the service name. To circumvent this, give the service name directly in "docker compose config". (no clue why it has not been done like this from the start) --- ci-scripts/cls_containerize.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ci-scripts/cls_containerize.py b/ci-scripts/cls_containerize.py index 75a421495e..f0503c0160 100644 --- a/ci-scripts/cls_containerize.py +++ b/ci-scripts/cls_containerize.py @@ -897,9 +897,7 @@ class Containerize(): mySSH.command(f'docker compose --file ci-docker-compose.yml up -d -- {svcName}', '\$', 30) # Checking Status - grep = '' - if svcName != '': grep = f' | grep -A3 --color=never {svcName}' - mySSH.command(f'docker compose --file ci-docker-compose.yml config {grep}', '\$', 5) + mySSH.command(f'docker compose --file ci-docker-compose.yml config {svcName}', '\$', 5) result = re.search('container_name: (?P[a-zA-Z0-9\-\_]+)', mySSH.getBefore()) unhealthyNb = 0 healthyNb = 0