diff --git a/examples/internal-ssl/Dockerfile b/examples/internal-ssl/Dockerfile index 9db031b..80c47bf 100644 --- a/examples/internal-ssl/Dockerfile +++ b/examples/internal-ssl/Dockerfile @@ -1,6 +1,6 @@ -FROM jupyterhub/jupyterhub:4 +FROM jupyterhub/jupyterhub:5 -COPY setup.py requirements.txt /src/dockerspawner/ +COPY pyproject.toml setup.py requirements.txt /src/dockerspawner/ COPY dockerspawner /src/dockerspawner/dockerspawner RUN pip install /src/dockerspawner diff --git a/examples/internal-ssl/docker-compose.yml b/examples/internal-ssl/docker-compose.yml index 2ff1931..105ed33 100644 --- a/examples/internal-ssl/docker-compose.yml +++ b/examples/internal-ssl/docker-compose.yml @@ -1,9 +1,6 @@ # Copyright (c) Jupyter Development Team. # Distributed under the terms of the Modified BSD License. -# JupyterHub docker-compose configuration file -version: "3" - services: proxy: depends_on: @@ -11,7 +8,7 @@ services: condition: service_completed_successfully container_name: proxy - image: jupyterhub/configurable-http-proxy:4 + image: quay.io/jupyterhub/configurable-http-proxy:4 restart: always environment: CONFIGPROXY_AUTH_TOKEN: ${CONFIGPROXY_AUTH_TOKEN} @@ -110,13 +107,13 @@ services: volumes: data: - external: - name: ${DATA_VOLUME_HOST} + name: ${DATA_VOLUME_HOST} + external: true ssl: - external: - name: ${SSL_VOLUME_HOST} + name: ${SSL_VOLUME_HOST} + external: true networks: default: - external: - name: ${DOCKER_NETWORK_NAME} + name: ${DOCKER_NETWORK_NAME} + external: true diff --git a/examples/internal-ssl/test_internal_ssl.py b/examples/internal-ssl/test_internal_ssl.py index 8e630d3..e578a69 100644 --- a/examples/internal-ssl/test_internal_ssl.py +++ b/examples/internal-ssl/test_internal_ssl.py @@ -14,7 +14,7 @@ @pytest.fixture(scope='session') def compose_build(): - check_call(['docker-compose', 'build'], cwd=here) + check_call(['docker', 'compose', 'build'], cwd=here) @pytest.fixture(scope='session') @@ -49,7 +49,7 @@ def volumes_and_networks(): @pytest.fixture(scope='session') def compose_up(volumes_and_networks, compose_build): - p = Popen(['docker-compose', 'up'], cwd=here) + p = Popen(['docker', 'compose', 'up'], cwd=here) for i in range(60): try: r = requests.get(hub_url + '/hub/') @@ -57,19 +57,19 @@ def compose_up(volumes_and_networks, compose_build): except Exception: time.sleep(1) if p.poll() is not None: - raise RuntimeError("`docker-compose up` failed") + raise RuntimeError("`docker compose up` failed") else: break else: p.terminate() - check_call(['docker-compose', 'rm', '-s', '-f'], cwd=here) + check_call(['docker', 'compose', 'rm', '-s', '-f'], cwd=here) raise TimeoutError("hub never showed up at %s" % hub_url) try: yield finally: p.terminate() - check_call(['docker-compose', 'rm', '-s', '-f'], cwd=here) + check_call(['docker', 'compose', 'rm', '-s', '-f'], cwd=here) def test_internal_ssl(compose_up):