hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-17 15:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Flush output in Python before running execvp (#2258)

Browse Source
This commit is contained in:
Ayaz Salikhov
2025-03-21 13:50:35 +00:00
committed by GitHub
parent 95aa99dd85
commit 929ebdb758
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
images/base-notebook/start-notebook.py
View File

@@ -8,7 +8,8 @@ import sys
# If we are in a JupyterHub, we pass on to `start-singleuser.py` instead so it does the right thing # If we are in a JupyterHub, we pass on to `start-singleuser.py` instead so it does the right thing
if "JUPYTERHUB_API_TOKEN" in os.environ: if "JUPYTERHUB_API_TOKEN" in os.environ:
print( print(
"WARNING: using start-singleuser.py instead of start-notebook.py to start a server associated with JupyterHub." "WARNING: using start-singleuser.py instead of start-notebook.py to start a server associated with JupyterHub.",
flush=True,
) )
command = ["/usr/local/bin/start-singleuser.py"] + sys.argv[1:] command = ["/usr/local/bin/start-singleuser.py"] + sys.argv[1:]
os.execvp(command[0], command) os.execvp(command[0], command)
@@ -40,5 +41,5 @@ if "NOTEBOOK_ARGS" in os.environ:
command += sys.argv[1:] command += sys.argv[1:]
# Execute the command! # Execute the command!
print("Executing: " + " ".join(command)) print("Executing: " + " ".join(command), flush=True)
os.execvp(command[0], command) os.execvp(command[0], command)

2
images/base-notebook/start-singleuser.py
View File

@@ -20,5 +20,5 @@ if "NOTEBOOK_ARGS" in os.environ:
command += sys.argv[1:] command += sys.argv[1:]
# Execute the command! # Execute the command!
print("Executing: " + " ".join(command)) print("Executing: " + " ".join(command), flush=True)
os.execvp(command[0], command) os.execvp(command[0], command)

6
tests/by_image/base-notebook/test_start_container.py
View File

@@ -42,11 +42,7 @@ def test_start_notebook(
f"Test that the start-notebook.py launches the {expected_command} server from the env {env} ..." f"Test that the start-notebook.py launches the {expected_command} server from the env {env} ..."
) )
host_port = find_free_port() host_port = find_free_port()
container.run_detached( container.run_detached(environment=env, ports={"8888/tcp": host_port})
tty=True,
environment=env,
ports={"8888/tcp": host_port},
)
# sleeping some time to let the server start # sleeping some time to let the server start
time.sleep(2) time.sleep(2)
logs = container.get_logs() logs = container.get_logs()