From 1497ffac779b7a0cf15ccf282416eeb2fe5fa990 Mon Sep 17 00:00:00 2001 From: Stefan Date: Fri, 23 Feb 2024 16:32:20 -0500 Subject: [PATCH] fix merge bug --- .../lib/backend_impls/docker/docker_manager/docker_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container-engine-lib/lib/backend_impls/docker/docker_manager/docker_manager.go b/container-engine-lib/lib/backend_impls/docker/docker_manager/docker_manager.go index 29cac21654..15978b0b57 100644 --- a/container-engine-lib/lib/backend_impls/docker/docker_manager/docker_manager.go +++ b/container-engine-lib/lib/backend_impls/docker/docker_manager/docker_manager.go @@ -1267,7 +1267,7 @@ func (manager *DockerManager) GetContainersByLabels(ctx context.Context, labels if err != nil { return nil, stacktrace.Propagate(err, "An error occurred getting containers with labels '%+v'", labelsFilterList) } - return result, nil + return resp, nil } func (manager *DockerManager) GetContainersByNetworkId(ctx context.Context, networkId string, shouldShowStoppedContainers bool) ([]*docker_manager_types.Container, error) {