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
labs/lab-01-iam/tests/03-non-root-test.sh
+2 -2
View File
@@ -107,7 +107,7 @@ test_no_container_runs_as_root() {
fi
# Get all services from compose file
local services=$(docker-compose -f "$compose_file" ps --services 2>/dev/null || echo "")
local services=$(docker compose -f "$compose_file" ps --services 2>/dev/null || echo "")
if [ -z "$services" ]; then
echo -e "${YELLOW}SKIP${NC}: No services defined yet"
@@ -118,7 +118,7 @@ test_no_container_runs_as_root() {
local root_containers=0
while IFS= read -r service; do
if [ -n "$service" ]; then
local container_name=$(docker-compose -f "$compose_file" ps -q "$service" 2>/dev/null || echo "")
local container_name=$(docker compose -f "$compose_file" ps -q "$service" 2>/dev/null || echo "")
if [ -n "$container_name" ]; then
local user=$(docker exec "$container_name" whoami 2>/dev/null || echo "unknown")
if [ "$user" = "root" ]; then
labs/lab-01-iam/tests/04-verify-infrastructure.sh
+6 -6
View File
@@ -104,11 +104,11 @@ else
fi
echo ""
# Test 6: Verify docker-compose service
echo -e "${BLUE}[6/6] Verifying docker-compose service...${NC}"
# Test 6: Verify docker compose service
echo -e "${BLUE}[6/6] Verifying docker compose service...${NC}"
# Start container in detached mode
if docker compose up -d >/dev/null 2>&1; then
echo -e " ${GREEN}✓${NC} docker-compose service started"
echo -e " ${GREEN}✓${NC} docker compose service started"
# Wait for container to be ready
sleep 3
@@ -120,10 +120,10 @@ if docker compose up -d >/dev/null 2>&1; then
# Verify user
actual_user=$(docker exec lab01-iam-test whoami 2>/dev/null || echo "unknown")
if [ "$actual_user" = "labuser" ]; then
echo -e " ${GREEN}✓${NC} docker-compose container runs as non-root"
echo -e " ${GREEN}✓${NC} docker compose container runs as non-root"
inc_pass
else
echo -e " ${RED}✗${NC} docker-compose container running as $actual_user (expected labuser)"
echo -e " ${RED}✗${NC} docker compose container running as $actual_user (expected labuser)"
inc_fail
fi
else
@@ -134,7 +134,7 @@ if docker compose up -d >/dev/null 2>&1; then
# Cleanup
docker compose down --volumes >/dev/null 2>&1
else
echo -e " ${RED}✗${NC} Failed to start docker-compose service"
echo -e " ${RED}✗${NC} Failed to start docker compose service"
inc_fail
fi
echo ""
labs/lab-01-iam/tests/99-final-verification.sh
+6 -5
View File
@@ -49,7 +49,8 @@ echo ""
# Test 3: Non-root container execution (INF-01)
echo -e "${BLUE}[3/3] Checking non-root container execution (INF-01)...${NC}"
compose_file="labs/lab-01-iam/docker-compose.yml"
cd labs/lab-01-iam
compose_file="docker-compose.yml"
if [ ! -f "$compose_file" ]; then
echo -e " ${YELLOW}○${NC} docker-compose.yml not found"
all_passed=false
@@ -65,11 +66,11 @@ else
fi
# If containers are running, verify they're not root
if docker-compose -f "$compose_file" ps --services 2>/dev/null | grep -q .; then
if docker compose -f "$compose_file" ps --services 2>/dev/null | grep -q .; then
local root_count=0
while IFS= read -r service; do
[ -z "$service" ] && continue
local container=$(docker-compose -f "$compose_file" ps -q "$service" 2>/dev/null || echo "")
local container=$(docker compose -f "$compose_file" ps -q "$service" 2>/dev/null || echo "")
if [ -n "$container" ]; then
local user=$(docker exec "$container" whoami 2>/dev/null || echo "unknown")
if [ "$user" = "root" ]; then
@@ -77,7 +78,7 @@ else
((root_count++)) || true
fi
fi
done <<< "$(docker-compose -f "$compose_file" ps --services 2>/dev/null)"
done <<< "$(docker compose -f "$compose_file" ps --services 2>/dev/null)"
if [ $root_count -eq 0 ]; then
echo -e " ${GREEN}✓${NC} All running containers are non-root"
@@ -85,7 +86,7 @@ else
all_passed=false
fi
else
echo -e " ${YELLOW}○${NC} No containers running (start with docker-compose up)"
echo -e " ${YELLOW}○${NC} No containers running (start with docker compose up)"
fi
fi
echo ""