1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-08-23 16:01:57 +00:00

test: wait for docker-gen container to be ready too

This commit is contained in:
Nicolas Duchon
2025-05-23 20:55:29 +02:00
parent 554689cc08
commit 4af3be397a

View File

@@ -348,16 +348,26 @@ def docker_compose_down(compose_files: List[str], project_name: str):
def wait_for_nginxproxy_to_be_ready(): def wait_for_nginxproxy_to_be_ready():
""" """
If one (and only one) container started from image nginxproxy/nginx-proxy:test is found, If one (and only one) container started from image nginxproxy/nginx-proxy:test
wait for its log to contain substring "Watching docker events" or nginxproxy/docker-gen:latest is found, wait for its log to contain the substring "Watching docker events"
""" """
containers = docker_client.containers.list(filters={"ancestor": "nginxproxy/nginx-proxy:test"}) nginx_proxy_containers = docker_client.containers.list(filters={"ancestor": "nginxproxy/nginx-proxy:test"})
if len(containers) != 1: docker_gen_containers = docker_client.containers.list(filters={"ancestor": "nginxproxy/docker-gen:latest"})
container_name = "nginx-proxy"
if len(nginx_proxy_containers) == 1:
container = nginx_proxy_containers.pop()
elif len(docker_gen_containers) == 1:
container = docker_gen_containers.pop()
container_name = "docker-gen"
else:
logging.debug("Either more than one or no nginx-proxy or docker-gen container found, skipping container readiness check")
return return
container = containers[0]
for line in container.logs(stream=True): for line in container.logs(stream=True):
if b"Watching docker events" in line: if b"Watching docker events" in line:
logging.debug("nginx-proxy ready") logging.debug(f"{container_name} ready")
break break