Skip to content

Commit

Permalink
Merge pull request #823 from flatcar/tormath1/docker-compose
Browse files Browse the repository at this point in the history
backend: change docker-compose to docker compose
  • Loading branch information
tormath1 authored Aug 5, 2024
2 parents cd76362 + 574722c commit 4ea6a3c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/updater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

- name: Start postgres dependency
run: |
docker-compose -f backend/docker-compose.test.yaml up -d postgres
docker compose -f backend/docker-compose.test.yaml up -d postgres
- name: Test library
env:
Expand Down
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
8 changes: 4 additions & 4 deletions backend/docker-compose.test.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Docker-compose file for interactive and for automated testing.
#
# Build docker image from local sources:
# docker-compose --file docker-compose.test.yaml build
# docker compose --file docker-compose.test.yaml build
#
# Run:
# docker-compose --file docker-compose.test.yaml run
# docker compose --file docker-compose.test.yaml run
# Run with persistent storage:
# docker-compose --file docker-compose.test.yaml --file docker-compose.test-db-persist.yaml up
# docker compose --file docker-compose.test.yaml --file docker-compose.test-db-persist.yaml up
#
# See docker-compose.pg-persist.yaml for more informatino on persistent storage.
# See docker-compose.pg-persist.yaml for more information on persistent storage.

version: "3.9"

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

0 comments on commit 4ea6a3c

Please sign in to comment.