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

Makefile: use docker compose v2 #1034

Merged
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CACHITO_COMPOSE_ENGINE ?= docker-compose
CACHITO_COMPOSE_ENGINE ?= docker compose
PYTHON_VERSION_VENV ?= python3.11
TOX_ENVLIST ?= python3.11
TOX_ARGS ?=
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@ To verify that your code meets these standards, you may run `tox -e black,flake8

## Quick Start

Run the application locally (requires [docker-compose](https://docs.docker.com/compose/)):
Run the application locally (requires [docker compose](https://docs.docker.com/compose/)):

```bash
make run
```

Note: while running Cachito locally requires docker-compose, that does not mean you
Note: while running Cachito locally requires docker compose, that does not mean you
have to use Docker! Podman 3.0 or greater can serve as a replacement, see
https://www.redhat.com/sysadmin/podman-docker-compose.

Expand Down Expand Up @@ -184,7 +184,7 @@ where `python3.11` is the version of python required based on `tox.ini`.
### Run a Containerized Development Environment

You may create and run the containerized development environment with
[docker-compose](https://docs.docker.com/compose/) with the following command:
[docker compose (v2)](https://docs.docker.com/compose/) with the following command:

```bash
make run-start
Expand Down Expand Up @@ -224,7 +224,7 @@ API may stop restarting if there is a syntax error.

#### Rebuilding Images

If you suspect that the images used for [`docker-compose`](#run-a-containerized-development-environment) are out of date, you can
If you suspect that the images used for [`docker compose`](#run-a-containerized-development-environment) are out of date, you can
run the containerized development environment while forcing a rebuild of the images with the following
command:

Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: '3'
services:
db:
image: docker.io/postgres:9.6
Expand Down