Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to Docker Compose v2 #135

Merged
merged 1 commit into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
- name: Get Docker version
run: |
docker --version
docker-compose --version

- name: Install pytest
run: pip install pytest requests
Expand All @@ -53,13 +52,13 @@ jobs:

- name: Run JupyterHub
working-directory: ${{ matrix.example }}
run: docker-compose up --detach
run: docker compose up --detach

- name: Test
working-directory: ${{ matrix.example }}
run: pytest --verbose --capture=no

- name: Print docker-compose logs
- name: Print docker compose logs
if: always()
working-directory: ${{ matrix.example }}
run: docker-compose logs
run: docker compose logs
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ This deployment uses [JupyterHub Native Authenticator](https://native-authentica

## Build the JupyterHub Docker image

1. Use [docker-compose](https://docs.docker.com/compose/reference/) to build
1. Use [docker compose](https://docs.docker.com/compose/reference/) to build
the JupyterHub Docker image:

```bash
docker-compose build
docker compose build
```

## Customisation: Jupyter Notebook Image
Expand Down Expand Up @@ -102,15 +102,15 @@ Run the JupyterHub container on the host.
To run the JupyterHub container in detached mode:

```bash
docker-compose up -d
docker compose up -d
```

Once the container is running, you should be able to access the JupyterHub console at `http://localhost:8000`.

To bring down the JupyterHub container:

```bash
docker-compose down
docker compose down
```

---
Expand Down
2 changes: 1 addition & 1 deletion basic-example/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

# JupyterHub docker-compose configuration file
# JupyterHub docker compose configuration file
version: "3"

services:
Expand Down