Skip to content

Fix/scripts makefile #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 19, 2025
Merged

Fix/scripts makefile #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
293d12d
fix: fix test scripts to persist container
mubbi Jul 19, 2025
d59abca
fix: fixed port check issues
mubbi Jul 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 37 additions & 23 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,32 +144,46 @@ docker-restart: docker-down docker-up
# Testing Environment
# =============================================================================


# Run tests (automated testing environment)
test: docker-setup-env
@echo "🧪 TESTING: Running complete test suite..."
cd containers && docker-compose -f docker-compose.test.yml up -d
@echo ">> Installing dependencies in test container..."
@sleep 10
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test composer install --no-interaction --prefer-dist --optimize-autoloader
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan key:generate --env=testing --force
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan migrate:fresh --seed --env=testing --force
@echo ">> Running tests..."
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan test --parallel --recreate-databases --stop-on-failure
cd containers && docker-compose -f docker-compose.test.yml down
@echo "✅ SUCCESS: Tests completed!"
test:
@if docker-compose -f containers/docker-compose.test.yml ps | grep -q 'laravel_blog_api_test' && docker-compose -f containers/docker-compose.test.yml ps | grep 'Up'; then \
echo "🧪 TESTING: Test container already running. Skipping setup..."; \
echo ">> Running tests..."; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan test --parallel --recreate-databases --stop-on-failure; \
echo "✅ SUCCESS: Tests completed!"; \
else \
echo "🧪 TESTING: Running complete test suite..."; \
cd containers && docker-compose -f docker-compose.test.yml up -d; \
echo ">> Installing dependencies in test container..."; \
sleep 10; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test composer install --no-interaction --prefer-dist --optimize-autoloader; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan key:generate --env=testing --force; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan migrate:fresh --seed --env=testing --force; \
echo ">> Running tests..."; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan test --parallel --recreate-databases --stop-on-failure; \
echo "✅ SUCCESS: Tests completed!"; \
fi


# Run tests with coverage report
test-coverage: docker-setup-env
@echo "🧪 TESTING: Running tests with coverage..."
cd containers && docker-compose -f docker-compose.test.yml up -d
@sleep 10
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test composer install --no-interaction --prefer-dist --optimize-autoloader
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan key:generate --env=testing --force
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan migrate:fresh --seed --env=testing --force
@echo ">> Running tests with coverage..."
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan test --coverage --coverage-html reports/coverage --coverage-clover reports/coverage.xml --stop-on-failure --min=80
cd containers && docker-compose -f docker-compose.test.yml down
@echo "✅ SUCCESS: Tests with coverage completed!"
test-coverage:
@if docker-compose -f containers/docker-compose.test.yml ps | grep -q 'laravel_blog_api_test' && docker-compose -f containers/docker-compose.test.yml ps | grep 'Up'; then \
echo "🧪 TESTING: Test container already running. Skipping setup..."; \
echo ">> Running tests with coverage..."; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan test --coverage --coverage-html reports/coverage --coverage-clover reports/coverage.xml --stop-on-failure --min=80; \
echo "✅ SUCCESS: Tests with coverage completed!"; \
else \
echo "🧪 TESTING: Running tests with coverage..."; \
cd containers && docker-compose -f docker-compose.test.yml up -d; \
sleep 10; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test composer install --no-interaction --prefer-dist --optimize-autoloader; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan key:generate --env=testing --force; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan migrate:fresh --seed --env=testing --force; \
echo ">> Running tests with coverage..."; \
docker-compose -f containers/docker-compose.test.yml exec -T laravel_blog_api_test php artisan test --coverage --coverage-html reports/coverage --coverage-clover reports/coverage.xml --stop-on-failure --min=80; \
echo "✅ SUCCESS: Tests with coverage completed!"; \
fi

# =============================================================================
# Code Quality Tools
Expand Down
18 changes: 6 additions & 12 deletions containers/check-ports.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,34 +46,29 @@ check_port() {
local optional=${3:-false}
local os=$(detect_os)
local port_in_use=false

case $os in
"windows")
# Use netstat on Windows (available by default)
if netstat -an | grep -q ":$port "; then
# Only consider LISTENING state
if netstat -an | grep -E ":$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
;;
"macos")
# Use netstat on macOS (available by default)
if netstat -an | grep -q "\\.$port "; then
# Only consider LISTEN state
if netstat -an | grep -E "\.$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
;;
"linux")
# Try multiple methods on Linux
if command -v ss &> /dev/null; then
# Use ss (modern replacement for netstat)
if ss -tuln | grep -q ":$port "; then
if ss -tuln | awk '{print $4,$1}' | grep -E "[:.]$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
elif command -v netstat &> /dev/null; then
# Fall back to netstat
if netstat -tuln | grep -q ":$port "; then
if netstat -tuln | grep -E ":$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
elif command -v nc &> /dev/null; then
# Fall back to netcat
if nc -z localhost $port 2>/dev/null; then
port_in_use=true
fi
Expand All @@ -83,7 +78,6 @@ check_port() {
fi
;;
*)
# Unknown OS - try netcat if available
if command -v nc &> /dev/null; then
if nc -z localhost $port 2>/dev/null; then
port_in_use=true
Expand Down
23 changes: 11 additions & 12 deletions containers/check-sonarqube-ports.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,36 +34,32 @@ detect_os() {
check_port() {
local port=$1
local description=$2
local optional=${3:-false}
local os=$(detect_os)
local port_in_use=false

case $os in
"windows")
# Use netstat on Windows (available by default)
if netstat -an | grep -q ":$port "; then
# Only consider LISTENING state
if netstat -an | grep -E ":$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
;;
"macos")
# Use netstat on macOS (available by default)
if netstat -an | grep -q "\\.$port "; then
# Only consider LISTEN state
if netstat -an | grep -E "\.$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
;;
"linux")
# Try multiple methods on Linux
if command -v ss &> /dev/null; then
# Use ss (modern replacement for netstat)
if ss -tuln | grep -q ":$port "; then
if ss -tuln | awk '{print $4,$1}' | grep -E "[:.]$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
elif command -v netstat &> /dev/null; then
# Fall back to netstat
if netstat -tuln | grep -q ":$port "; then
if netstat -tuln | grep -E ":$port[[:space:]]" | grep -iq "LISTEN"; then
port_in_use=true
fi
elif command -v nc &> /dev/null; then
# Fall back to netcat
if nc -z localhost $port 2>/dev/null; then
port_in_use=true
fi
Expand All @@ -73,7 +69,6 @@ check_port() {
fi
;;
*)
# Unknown OS - try netcat if available
if command -v nc &> /dev/null; then
if nc -z localhost $port 2>/dev/null; then
port_in_use=true
Expand All @@ -84,6 +79,10 @@ check_port() {
fi
;;
esac
return 0
fi
;;
esac

if [ "$port_in_use" = true ]; then
echo -e "${RED}❌ PORT $port ($description) is already in use${NC}"
Expand Down