Skip to content

Commit

Permalink
Replace use of docker-compose with docker compose. (#668)
Browse files Browse the repository at this point in the history
* update: use `docker compose` in favour of `docker-compose`

* `version` is obsolete"
  • Loading branch information
RealistikDash authored Jun 27, 2024
1 parent 75f26e6 commit af126d9
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 15 deletions.
3 changes: 1 addition & 2 deletions .github/docs/wiki/Setting-up.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ git clone https://github.com/osuAkatsuki/bancho.py
cd bancho.py

# install docker for building the application image
# install docker-compose for running the application & dependencies
sudo apt install -y docker docker-compose
sudo apt install -y docker
```

## configuring bancho.py
Expand Down
3 changes: 1 addition & 2 deletions .github/docs/wiki/locale/de-DE/Setting-up-de-DE.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ git clone https://github.com/osuAkatsuki/bancho.py
cd bancho.py

# install docker for building the application image
# install docker-compose for running the application & dependencies
sudo apt install -y docker docker-compose
sudo apt install -y docker
```

## configuring bancho.py
Expand Down
3 changes: 1 addition & 2 deletions .github/docs/wiki/locale/zh-CN/Setting-up-zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ git clone https://github.com/osuAkatsuki/bancho.py
cd bancho.py

# install docker for building the application image
# install docker-compose for running the application & dependencies
sudo apt install -y docker docker-compose
sudo apt install -y docker
```

## configuring bancho.py
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ build:
docker build -t bancho:latest .

run:
docker-compose up bancho mysql redis
docker compose up bancho mysql redis

run-bg:
docker-compose up -d bancho mysql redis
docker compose up -d bancho mysql redis

run-caddy:
caddy run --envfile .env --config ext/Caddyfile

last?=1
logs:
docker-compose logs -f bancho mysql redis --tail ${last}
docker compose logs -f bancho mysql redis --tail ${last}

shell:
poetry shell

test:
docker-compose -f docker-compose.test.yml up -d bancho-test mysql-test redis-test
docker-compose -f docker-compose.test.yml exec -T bancho-test /srv/root/scripts/run-tests.sh
docker compose -f docker-compose.test.yml up -d bancho-test mysql-test redis-test
docker compose -f docker-compose.test.yml exec -T bancho-test /srv/root/scripts/run-tests.sh

lint:
poetry run pre-commit run --all-files
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

services:
## shared services

Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.8"

services:
## shared services

Expand Down

0 comments on commit af126d9

Please sign in to comment.