Skip to content

Commit 0d1f1de

Browse files
Use Docker Compose V2 (#88)
## Ticket Resolves #33 ## Changes Updates all references to `docker-compose` to `docker compose`.
1 parent 670aaa6 commit 0d1f1de

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

app/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@ setup-local:
8787
##################################################
8888

8989
build:
90-
docker-compose build
90+
docker compose build
9191

9292
start:
93-
docker-compose up --detach
93+
docker compose up --detach
9494

9595
run-logs: start
96-
docker-compose logs --follow --no-color $(APP_NAME)
96+
docker compose logs --follow --no-color $(APP_NAME)
9797

9898
init: build init-db
9999

100100
clean-volumes: ## Remove project docker volumes (which includes the DB state)
101-
docker-compose down --volumes
101+
docker compose down --volumes
102102

103103
stop:
104-
docker-compose down
104+
docker compose down
105105

106106
check: format-check lint test
107107

@@ -118,7 +118,7 @@ check: format-check lint test
118118
init-db: start-db db-migrate
119119

120120
start-db:
121-
docker-compose up --detach main-db
121+
docker compose up --detach main-db
122122
./bin/wait-for-local-db.sh
123123

124124
## Destroy current DB, setup new one

app/src/logging/decodelog.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Make JSON logs easier to read when developing or troubleshooting.
33
#
4-
# Expects JSON log lines or `docker-compose log` output on stdin and outputs plain text lines on
4+
# Expects JSON log lines or `docker compose log` output on stdin and outputs plain text lines on
55
# stdout.
66
#
77
# This module intentionally has no dependencies outside the standard library so that it can be run
@@ -42,7 +42,7 @@ def process_line(line: str) -> Optional[str]:
4242
# JSON format
4343
return decode_json_line(line)
4444
elif "| {" in line:
45-
# `docker-compose logs ...` format
45+
# `docker compose logs ...` format
4646
return decode_json_line(line[line.find("| {") + 2 :])
4747
# Anything else is left alone
4848
return line

0 commit comments

Comments
 (0)