Skip to content

Commit 920a3a8

Browse files
authored
Merge pull request #135 from mathbunnyru/docker_compose_v2
Switch to Docker Compose v2
2 parents e31f3a5 + de2935f commit 920a3a8

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

.github/workflows/test.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
- name: Get Docker version
4444
run: |
4545
docker --version
46-
docker-compose --version
4746
4847
- name: Install pytest
4948
run: pip install pytest requests
@@ -53,13 +52,13 @@ jobs:
5352

5453
- name: Run JupyterHub
5554
working-directory: ${{ matrix.example }}
56-
run: docker-compose up --detach
55+
run: docker compose up --detach
5756

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

62-
- name: Print docker-compose logs
61+
- name: Print docker compose logs
6362
if: always()
6463
working-directory: ${{ matrix.example }}
65-
run: docker-compose logs
64+
run: docker compose logs

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ This deployment uses [JupyterHub Native Authenticator](https://native-authentica
6060

6161
## Build the JupyterHub Docker image
6262

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

6666
```bash
67-
docker-compose build
67+
docker compose build
6868
```
6969

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

104104
```bash
105-
docker-compose up -d
105+
docker compose up -d
106106
```
107107

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

110110
To bring down the JupyterHub container:
111111

112112
```bash
113-
docker-compose down
113+
docker compose down
114114
```
115115

116116
---

basic-example/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) Jupyter Development Team.
22
# Distributed under the terms of the Modified BSD License.
33

4-
# JupyterHub docker-compose configuration file
4+
# JupyterHub docker compose configuration file
55
version: "3"
66

77
services:

0 commit comments

Comments
 (0)