TTF/laboratori-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: replace deprecated docker-compose with docker compose across repository

Browse Source
This commit is contained in:
Luca Sacchi Ricciardi
2026-04-09 12:15:00 +02:00
parent 64b7d49056
commit dceefe0573
33 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.planning/phases/03-lab-02-network-vpc/03-03-PLAN.md
+27 -27
View File
@@ -21,7 +21,7 @@ must_haves:
- "Private networks use --internal flag and no published ports"
- "Public services bind to 127.0.0.1 only (INF-02 compliant)"
- "Infrastructure verification tests pass (GREEN phase)"
- "All services start successfully with docker-compose up"
- "All services start successfully with docker compose up"
artifacts:
- path: "labs/lab-02-network/docker-compose.yml"
provides: "VPC network definition with subnets"
@@ -47,7 +47,7 @@ must_haves:
<objective>
Create Docker infrastructure (docker-compose.yml and Dockerfile) implementing VPC simulation with isolated bridge networks. Following TDD methodology, this is the GREEN phase - tests already exist from Plan 03-01, and infrastructure should make those tests pass. Infrastructure must enforce INF-02 compliance (private networks don't expose ports on 0.0.0.0).
Purpose: Implement network infrastructure that simulates AWS VPC with public and private subnets. Students learn by running docker-compose and observing isolated networks in action.
Purpose: Implement network infrastructure that simulates AWS VPC with public and private subnets. Students learn by running docker compose and observing isolated networks in action.
Output: Working docker-compose.yml with VPC networks, test container image, and infrastructure verification script that validates all requirements.
</objective>
@@ -262,7 +262,7 @@ From REQUIREMENTS.md:
Expected: ~100 lines with complete VPC simulation
</action>
<verify>
<automated>cd labs/lab-02-network && docker-compose config && docker-compose up -d && docker-compose ps</automated>
<automated>cd labs/lab-02-network && docker compose config && docker compose up -d && docker compose ps</automated>
</verify>
<done>docker-compose.yml defines VPC networks with correct subnets. Services deployed in appropriate tiers. INF-02 compliant (127.0.0.1 bindings only).</done>
</task>
@@ -374,7 +374,7 @@ From REQUIREMENTS.md:
Expected: ~45 lines with non-root user and networking tools
</action>
<verify>
<automated>cd labs/lab-02-network && docker-compose build api && docker images | grep lab02-api</automated>
<automated>cd labs/lab-02-network && docker compose build api && docker images | grep lab02-api</automated>
</verify>
<done>Dockerfile builds successfully. Creates non-root container with networking tools. Healthcheck tests connectivity to private network.</done>
</task>
@@ -391,7 +391,7 @@ From REQUIREMENTS.md:
3. Verify subnet configurations (10.0.1.0/24, 10.0.2.0/24)
4. Verify INF-02 compliance (no 0.0.0.0 bindings)
5. Verify private network has internal: true flag
6. Verify docker-compose build succeeds
6. Verify docker compose build succeeds
7. Verify services start successfully
8. Verify network isolation (web cannot ping db)
9. Verify same-network communication (api can reach db)
@@ -399,7 +399,7 @@ From REQUIREMENTS.md:
Requirements:
- Follow Phase 2 test patterns (color output, helper functions)
- Use docker-compose config to validate YAML
- Use docker compose config to validate YAML
- Use docker network inspect to verify network config
- Use docker exec for connectivity tests
- Use grep for INF-02 validation
@@ -442,7 +442,7 @@ From REQUIREMENTS.md:
# Test 1: docker-compose.yml is valid
echo -e "[1/10] Testing docker-compose.yml syntax..."
if docker-compose config > /dev/null 2>&1; then
if docker compose config > /dev/null 2>&1; then
echo -e "${GREEN}PASS${NC}: docker-compose.yml is valid"
inc_pass
else
@@ -452,8 +452,8 @@ From REQUIREMENTS.md:
# Test 2: Networks defined
echo -e "[2/10] Testing network definitions..."
if docker-compose config | grep -q "vpc-public:" && \
docker-compose config | grep -q "vpc-private:"; then
if docker compose config | grep -q "vpc-public:" && \
docker compose config | grep -q "vpc-private:"; then
echo -e "${GREEN}PASS${NC}: vpc-public and vpc-private networks defined"
inc_pass
else
@@ -463,8 +463,8 @@ From REQUIREMENTS.md:
# Test 3: Subnet configurations
echo -e "[3/10] Testing subnet configurations..."
if docker-compose config | grep -q "10.0.1.0/24" && \
docker-compose config | grep -q "10.0.2.0/24"; then
if docker compose config | grep -q "10.0.1.0/24" && \
docker compose config | grep -q "10.0.2.0/24"; then
echo -e "${GREEN}PASS${NC}: Subnets 10.0.1.0/24 and 10.0.2.0/24 configured"
inc_pass
else
@@ -474,7 +474,7 @@ From REQUIREMENTS.md:
# Test 4: INF-02 compliance
echo -e "[4/10] Testing INF-02 compliance (no 0.0.0.0 bindings)..."
if docker-compose config | grep -qE '0\.0\.0\.0:[0-9]+'; then
if docker compose config | grep -qE '0\.0\.0\.0:[0-9]+'; then
echo -e "${RED}FAIL${NC}: Found 0.0.0.0 port bindings (INF-02 violation)"
inc_fail
else
@@ -484,7 +484,7 @@ From REQUIREMENTS.md:
# Test 5: Private network internal flag
echo -e "[5/10] Testing private network isolation..."
if docker-compose config | grep -A 3 "vpc-private:" | grep -q "internal: true"; then
if docker compose config | grep -A 3 "vpc-private:" | grep -q "internal: true"; then
echo -e "${GREEN}PASS${NC}: vpc-private has internal: true flag"
inc_pass
else
@@ -493,8 +493,8 @@ From REQUIREMENTS.md:
fi
# Test 6: Build succeeds
echo -e "[6/10] Testing docker-compose build..."
if docker-compose build -q api > /dev/null 2>&1; then
echo -e "[6/10] Testing docker compose build..."
if docker compose build -q api > /dev/null 2>&1; then
echo -e "${GREEN}PASS${NC}: Docker image builds successfully"
inc_pass
else
@@ -504,10 +504,10 @@ From REQUIREMENTS.md:
# Test 7-10: Runtime tests (if services running)
# Check if services are running
if docker-compose ps | grep -q "Up"; then
if docker compose ps | grep -q "Up"; then
# Test 7: Services running
echo -e "[7/10] Testing service status..."
running_count=$(docker-compose ps | grep -c "Up" || true)
running_count=$(docker compose ps | grep -c "Up" || true)
if [ "$running_count" -ge 2 ]; then
echo -e "${GREEN}PASS${NC}: Services are running ($running_count services)"
inc_pass
@@ -590,19 +590,19 @@ After all tasks complete, verify:
- tests/04-verify-infrastructure.sh exists
2. **Compose Configuration**:
- `docker-compose config` succeeds (valid YAML)
- `docker compose config` succeeds (valid YAML)
- Two networks defined: vpc-public, vpc-private
- Correct subnets: 10.0.1.0/24, 10.0.2.0/24
- Three services: web, api, db
3. **INF-02 Compliance**:
- No 0.0.0.0 bindings in docker-compose config
- No 0.0.0.0 bindings in docker compose config
- Public services use 127.0.0.1:PORT:PORT format
- Private services have no published ports
- vpc-private has internal: true flag
4. **Services Start Successfully**:
- `docker-compose up -d` succeeds
- `docker compose up -d` succeeds
- All containers show "Up" status
- Containers have correct network attachments
@@ -619,19 +619,19 @@ After all tasks complete, verify:
```bash
# Verify compose configuration
cd labs/lab-02-network && docker-compose config
cd labs/lab-02-network && docker compose config
# Check for INF-02 violations (should return nothing)
cd labs/lab-02-network && docker-compose config | grep "0.0.0.0"
cd labs/lab-02-network && docker compose config | grep "0.0.0.0"
# Build services
cd labs/lab-02-network && docker-compose build
cd labs/lab-02-network && docker compose build
# Start services
cd labs/lab-02-network && docker-compose up -d
cd labs/lab-02-network && docker compose up -d
# Check service status
cd labs/lab-02-network && docker-compose ps
cd labs/lab-02-network && docker compose ps
# Verify networks created
docker network ls | grep lab02
@@ -643,7 +643,7 @@ bash labs/lab-02-network/tests/04-verify-infrastructure.sh
bash labs/lab-02-network/tests/run-all-tests.sh
# Cleanup
cd labs/lab-02-network && docker-compose down -v
cd labs/lab-02-network && docker compose down -v
```
## Success Criteria
@@ -652,7 +652,7 @@ cd labs/lab-02-network && docker-compose down -v
- [ ] Two networks defined: vpc-public (10.0.1.0/24), vpc-private (10.0.2.0/24)
- [ ] vpc-private has internal: true flag
- [ ] No 0.0.0.0 port bindings (INF-02 compliant)
- [ ] Services start successfully with docker-compose up
- [ ] Services start successfully with docker compose up
- [ ] Network isolation verified (public cannot reach private)
- [ ] Infrastructure verification script passes all tests
- [ ] All tests from Plan 03-01 now pass (GREEN phase complete)