Skip to content

Commit

Permalink
Merge pull request #135 from mathbunnyru/docker_compose_v2
Browse files Browse the repository at this point in the history
Switch to Docker Compose v2
  • Loading branch information
manics authored Nov 22, 2023
2 parents e31f3a5 + de2935f commit 920a3a8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
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

0 comments on commit 920a3a8

Please sign in to comment.