Skip to content

Commit 19af7e9

Browse files
Santosh Kumar RadhaSantosh Kumar Radha
authored andcommitted
Use docker compose CLI
1 parent a244afe commit 19af7e9

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/workflows/functional-tests.yml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ test-functional-local:
5656
exit 1; \
5757
fi
5858
cd tests/functional && \
59-
docker-compose -f docker/docker-compose.local.yml up --build --abort-on-container-exit --exit-code-from test-runner
59+
docker compose -f docker/docker-compose.local.yml up --build --abort-on-container-exit --exit-code-from test-runner
6060
$(MAKE) test-functional-cleanup-local
6161

6262
test-functional-postgres:
@@ -68,18 +68,18 @@ test-functional-postgres:
6868
exit 1; \
6969
fi
7070
cd tests/functional && \
71-
docker-compose -f docker/docker-compose.postgres.yml up --build --abort-on-container-exit --exit-code-from test-runner
71+
docker compose -f docker/docker-compose.postgres.yml up --build --abort-on-container-exit --exit-code-from test-runner
7272
$(MAKE) test-functional-cleanup-postgres
7373

7474
test-functional-cleanup: test-functional-cleanup-local test-functional-cleanup-postgres
7575

7676
test-functional-cleanup-local:
7777
@echo "🧹 Cleaning up local test environment..."
78-
cd tests/functional && docker-compose -f docker/docker-compose.local.yml down -v 2>/dev/null || true
78+
cd tests/functional && docker compose -f docker/docker-compose.local.yml down -v 2>/dev/null || true
7979

8080
test-functional-cleanup-postgres:
8181
@echo "🧹 Cleaning up postgres test environment..."
82-
cd tests/functional && docker-compose -f docker/docker-compose.postgres.yml down -v 2>/dev/null || true
82+
cd tests/functional && docker compose -f docker/docker-compose.postgres.yml down -v 2>/dev/null || true
8383

8484
test-functional-ci:
8585
@echo "🧪 Running functional tests in CI mode..."

tests/functional/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ This test suite runs end-to-end functional tests in an isolated Docker environme
3636
```
3737
tests/functional/
3838
├── docker/
39-
│ ├── docker-compose.local.yml # SQLite mode (fast)
40-
│ ├── docker-compose.postgres.yml # PostgreSQL mode (production-like)
39+
│ ├── docker compose.local.yml # SQLite mode (fast)
40+
│ ├── docker compose.postgres.yml # PostgreSQL mode (production-like)
4141
│ ├── Dockerfile.test-runner # Test execution container
4242
│ ├── agentfield-test.yaml # Control plane configuration
4343
│ └── wait-for-services.sh # Health check script
@@ -101,10 +101,10 @@ tests/functional/
101101
make test-functional-postgres # PostgreSQL mode
102102
make test-functional # Both modes
103103

104-
# Or directly with docker-compose
104+
# Or directly with docker compose
105105
cd tests/functional
106106
export OPENROUTER_API_KEY=your_key
107-
docker-compose -f docker/docker-compose.local.yml up --build
107+
docker compose -f docker/docker compose.local.yml up --build
108108
```
109109

110110
## 📖 Usage Guide
@@ -326,13 +326,13 @@ Reports include:
326326
```bash
327327
# Control plane logs
328328
cd tests/functional
329-
docker-compose -f docker/docker-compose.local.yml logs control-plane
329+
docker compose -f docker/docker compose.local.yml logs control-plane
330330

331331
# Test runner logs
332-
docker-compose -f docker/docker-compose.local.yml logs test-runner
332+
docker compose -f docker/docker compose.local.yml logs test-runner
333333

334334
# All logs
335-
docker-compose -f docker/docker-compose.local.yml logs
335+
docker compose -f docker/docker compose.local.yml logs
336336
```
337337

338338
### Interactive Debugging
@@ -343,10 +343,10 @@ Start services without running tests:
343343
cd tests/functional
344344

345345
# Start just the control plane
346-
docker-compose -f docker/docker-compose.local.yml up control-plane
346+
docker compose -f docker/docker compose.local.yml up control-plane
347347

348348
# In another terminal, run tests with debugging
349-
docker-compose -f docker/docker-compose.local.yml run test-runner bash
349+
docker compose -f docker/docker compose.local.yml run test-runner bash
350350
# Inside container:
351351
pytest -vv --pdb
352352
```
@@ -462,7 +462,7 @@ Make sure you've either:
462462

463463
Check logs:
464464
```bash
465-
docker-compose -f docker/docker-compose.local.yml logs control-plane
465+
docker compose -f docker/docker compose.local.yml logs control-plane
466466
```
467467

468468
Common issues:

0 commit comments

Comments
 (0)