Skip to content

Commit a4a6b2d

Browse files
maxipavlovicmaxipavlovic
committed
LITE-31232 docker compose is now used instead of docker-compose 
1 parent 901aac3 commit a4a6b2d

File tree

5 files changed

+35
-35
lines changed

5 files changed

+35
-35
lines changed

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ Unit testing
228228

229229
Run tests with various RDBMS:
230230
- `cd integration_tests`
231-
- `DB=postgres docker-compose -f docker-compose.yml -f rdbms.yml run app_test`
232-
- `DB=mysql docker-compose -f docker-compose.yml -f rdbms.yml run app_test`
231+
- `DB=postgres docker compose -f docker-compose.yml -f rdbms.yml run app_test`
232+
- `DB=mysql docker compose -f docker-compose.yml -f rdbms.yml run app_test`
233233

234234
Check code style: `flake8`
235235
Run tests: `pytest`
@@ -244,6 +244,6 @@ To generate HTML coverage reports use:
244244

245245
Integrational testing
246246
------
247-
1. docker-compose
247+
1. docker compose
248248
2. `cd integration_tests`
249-
3. `docker-compose run master`
249+
3. `docker compose run master`

‎examples/demo_project/README.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ It's a simple demo project contains 2 services:
88
## Start project:
99

1010
```
11-
docker-compose up -d db_pgsql db_mysql
12-
docker-compose run master ./manage.py migrate
13-
docker-compose run replica ./manage.py migrate
14-
docker-compose up -d
15-
docker-compose run master ./manage.py cqrs_sync --cqrs-id=user -f={}
16-
docker-compose run master ./manage.py cqrs_sync --cqrs-id=product -f={}
11+
docker compose up -d db_pgsql db_mysql
12+
docker compose run master ./manage.py migrate
13+
docker compose run replica ./manage.py migrate
14+
docker compose up -d
15+
docker compose run master ./manage.py cqrs_sync --cqrs-id=user -f={}
16+
docker compose run master ./manage.py cqrs_sync --cqrs-id=product -f={}
1717
```
1818

1919
It starts master WEB app on [http://127.0.0.1:8000](http://127.0.0.1:8000) and replica on [http://127.0.0.1:8001](http://127.0.0.1:8001)

‎integration_tests/Makefile‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,40 @@
33
.DEFAULT_GOAL := pika
44

55
build:
6-
docker-compose build
6+
docker compose build
77

88
build_master_v1:
9-
docker-compose -f docker-compose.yml -f masterV1.yml build
9+
docker compose -f docker-compose.yml -f masterV1.yml build
1010

1111
build_replica_v1:
12-
docker-compose -f docker-compose.yml -f replicaV1.yml build
12+
docker compose -f docker-compose.yml -f replicaV1.yml build
1313

1414
pika: build
1515
@echo "Run PIKA integration tests..."
16-
docker-compose run master
16+
docker compose run master
1717
@echo "Stopping running containers..."
18-
docker-compose down --remove-orphans
18+
docker compose down --remove-orphans
1919
@echo "Done!"
2020

2121
kombu: build
2222
@echo "Run KOMBU integration tests..."
23-
docker-compose -f docker-compose.yml -f kombu.yml run master
23+
docker compose -f docker-compose.yml -f kombu.yml run master
2424
@echo "Stopping running containers..."
25-
docker-compose -f docker-compose.yml -f kombu.yml down --remove-orphans
25+
docker compose -f docker-compose.yml -f kombu.yml down --remove-orphans
2626
@echo "Done!"
2727

2828
master_v1: build_master_v1
2929
@echo "Run regression tests Master v1.3.1..."
30-
docker-compose -f docker-compose.yml -f masterV1.yml run master
30+
docker compose -f docker-compose.yml -f masterV1.yml run master
3131
@echo "Stopping running containers..."
32-
docker-compose -f docker-compose.yml -f masterV1.yml down --remove-orphans
32+
docker compose -f docker-compose.yml -f masterV1.yml down --remove-orphans
3333
@echo "Done!"
3434

3535
replica_v1: build_replica_v1
3636
@echo "Run regression tests Replica v1.3.1..."
37-
docker-compose -f docker-compose.yml -f replicaV1.yml run master
37+
docker compose -f docker-compose.yml -f replicaV1.yml run master
3838
@echo "Stopping running containers..."
39-
docker-compose -f docker-compose.yml -f replicaV1.yml down --remove-orphans
39+
docker compose -f docker-compose.yml -f replicaV1.yml down --remove-orphans
4040
@echo "Done!"
4141

4242
all: pika kombu master_v1 replica_v1

‎travis_compat_tests.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ if [ "$COMPAT_TESTS" == "yes" ]; then
66
echo "Running backward compatibility tests....."
77
cd integration_tests
88
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
9-
docker-compose -f docker-compose.yml -f masterV1.yml build
10-
docker-compose -f docker-compose.yml -f masterV1.yml run master
11-
docker-compose -f docker-compose.yml -f masterV1.yml down --remove-orphans
9+
docker compose-f docker-compose.yml -f masterV1.yml build
10+
docker compose-f docker-compose.yml -f masterV1.yml run master
11+
docker compose-f docker-compose.yml -f masterV1.yml down --remove-orphans
1212

13-
docker-compose -f docker-compose.yml -f replicaV1.yml build
14-
docker-compose -f docker-compose.yml -f replicaV1.yml run master
15-
docker-compose -f docker-compose.yml -f replicaV1.yml down --remove-orphans
13+
docker compose-f docker-compose.yml -f replicaV1.yml build
14+
docker compose-f docker-compose.yml -f replicaV1.yml run master
15+
docker compose-f docker-compose.yml -f replicaV1.yml down --remove-orphans
1616
cd ..
1717
echo "Done!"
1818
else

‎travis_integration_tests.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ if [ "$INTEGRATION_TESTS" == "yes" ]; then
66
echo "Running integration tests....."
77
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
88
cd integration_tests
9-
docker-compose build
10-
docker-compose run master
11-
docker-compose down --remove-orphans
12-
docker-compose -f docker-compose.yml -f kombu.yml run master
13-
docker-compose -f docker-compose.yml -f kombu.yml down --remove-orphans
14-
DB=postgres docker-compose -f docker-compose.yml -f rdbms.yml run app_test
15-
DB=mysql docker-compose -f docker-compose.yml -f rdbms.yml run app_test
16-
docker-compose -f docker-compose.yml -f rdbms.yml down --remove-orphans
9+
docker compose build
10+
docker compose run master
11+
docker compose down --remove-orphans
12+
docker compose -f docker-compose.yml -f kombu.yml run master
13+
docker compose -f docker-compose.yml -f kombu.yml down --remove-orphans
14+
DB=postgres docker compose -f docker-compose.yml -f rdbms.yml run app_test
15+
DB=mysql docker compose -f docker-compose.yml -f rdbms.yml run app_test
16+
docker compose -f docker-compose.yml -f rdbms.yml down --remove-orphans
1717

1818
cd ..
1919
echo "Done!"

0 commit comments

Comments
 (0)