Skip to content

Commit

Permalink
Merge pull request #628 from kinvolk/kai/podman-compose
Browse files Browse the repository at this point in the history
Support Podman in docker-compose setup
  • Loading branch information
pothos authored Nov 25, 2022
2 parents 0fc8c4b + f7eea12 commit bf2ba86
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions backend/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ check-code-coverage:

.PHONY: test-service-up
test-service-up:
docker compose -f ./docker-compose.test.yaml up -d --build
docker-compose -f ./docker-compose.test.yaml up -d --build

.PHONY: test-service-down
test-service-down:
docker compose -f ./docker-compose.test.yaml down
docker-compose -f ./docker-compose.test.yaml down

.PHONY: check-backend-with-container
check-backend-with-container: test-service-down
Expand Down
2 changes: 1 addition & 1 deletion backend/test/api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

1. Run the docker compose file with the following command to get the service up and running.

> docker compose -f ./docker-compose.test.yaml up -d
> docker-compose -f ./docker-compose.test.yaml up -d
2. Run the test using the following command

Expand Down
6 changes: 3 additions & 3 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ opened browser page should automatically refresh.

## Docker compose V2

You may be missing the `docker compose` plugin, which is required to run some tests.
You may be missing `docker-compose`, which is required to run some tests.

```bash
docker compose version
docker-compose version

cd backend
make check-backend-with-container
```

If so, see https://docs.docker.com/compose/cli-command/#install-on-linux
If so, see https://docs.docker.com/compose/install/other/ or https://github.com/containers/podman-compose (with setting up a `docker-compose` symlink)

# Development Concepts

Expand Down

0 comments on commit bf2ba86

Please sign in to comment.