From 1cb6717fea2a1ab1bd9606f8bbb6e4091f9e1010 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Mon, 20 May 2019 09:52:50 -0700 Subject: [PATCH] Say 'running inside a docker container', not 'plain docker' 'Plain docker' makes no sense --- bootstrap/bootstrap.py | 3 ++- integration-tests/test_bootstrap.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index adbc9fc..70bdbf8 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -54,7 +54,8 @@ def validate_host(): print("Systemd is required to run TLJH") # Only fail running inside docker if systemd isn't present if os.path.exists('/.dockerenv'): - print("Running inside a plain docker container isn't supported") + print("Running inside a docker container without systemd isn't supported") + print("We recommend against running a production TLJH instance inside a docker container") print("For local development, see http://tljh.jupyter.org/en/latest/contributing/dev-setup.html") sys.exit(1) diff --git a/integration-tests/test_bootstrap.py b/integration-tests/test_bootstrap.py index a93fc5a..fa02b68 100644 --- a/integration-tests/test_bootstrap.py +++ b/integration-tests/test_bootstrap.py @@ -45,11 +45,12 @@ def test_ubuntu_too_old(): assert output.returncode == 1 -def test_inside_plain_docker(): +def test_inside_no_systemd_docker(): output = run_bootstrap('plain-docker-test', 'ubuntu:18.04') assert output.stdout.strip() == dedent(""" Systemd is required to run TLJH - Running inside a plain docker container isn't supported + Running inside a docker container without systemd isn't supported + We recommend against running a production TLJH instance inside a docker container For local development, see http://tljh.jupyter.org/en/latest/contributing/dev-setup.html """).strip() assert output.returncode == 1