Use env vars for ports, add .env.TEST
- WIZARD_PORT, MYSQL_PORT, BACKEND_PORT, FRONTEND_PORT env vars - .env.TEST with default values (8080, 3306, 8000, 3000) - Scripts load .env.TEST automatically - LISTEN_ADDR uses env vars - Ports bound to 127.0.0.1 for security
This commit is contained in:
14
.env.TEST
Normal file
14
.env.TEST
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
# HarborForge Test Environment Variables
|
||||||
|
# Default port values
|
||||||
|
|
||||||
|
# Wizard service
|
||||||
|
WIZARD_PORT=8080
|
||||||
|
|
||||||
|
# MySQL service
|
||||||
|
MYSQL_PORT=3306
|
||||||
|
|
||||||
|
# Backend service
|
||||||
|
BACKEND_PORT=8000
|
||||||
|
|
||||||
|
# Frontend service
|
||||||
|
FRONTEND_PORT=3000
|
||||||
@@ -8,6 +8,14 @@ set -e
|
|||||||
EXPOSE_PORT="off"
|
EXPOSE_PORT="off"
|
||||||
COMPOSE_FILE="docker-compose-frontend.yml"
|
COMPOSE_FILE="docker-compose-frontend.yml"
|
||||||
|
|
||||||
|
# Load environment variables from .env.TEST if exists
|
||||||
|
if [ -f ".env.TEST" ]; then
|
||||||
|
echo "📋 Loading .env.TEST..."
|
||||||
|
set -a
|
||||||
|
source .env.TEST
|
||||||
|
set +a
|
||||||
|
fi
|
||||||
|
|
||||||
# Parse arguments
|
# Parse arguments
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ services:
|
|||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
ports:
|
||||||
|
- "127.0.0.1:${MYSQL_PORT:-3306}:3306"
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -30,11 +32,11 @@ services:
|
|||||||
- wizard_config:/config
|
- wizard_config:/config
|
||||||
environment:
|
environment:
|
||||||
CONFIG_DIR: /config
|
CONFIG_DIR: /config
|
||||||
LISTEN_ADDR: "0.0.0.0:8080"
|
LISTEN_ADDR: "0.0.0.0:${WIZARD_PORT:-8080}"
|
||||||
MAX_BACKUPS: "5"
|
MAX_BACKUPS: "5"
|
||||||
CORS_ORIGINS: http://localhost:18080
|
CORS_ORIGINS: http://127.0.0.1:${FRONTEND_PORT:-3000},http://localhost:${FRONTEND_PORT:-3000}
|
||||||
ports:
|
ports:
|
||||||
- "18080:8080"
|
- "127.0.0.1:${WIZARD_PORT:-8080}:${WIZARD_PORT:-8080}"
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -52,9 +54,12 @@ services:
|
|||||||
CONFIG_FILE: harborforge.json
|
CONFIG_FILE: harborforge.json
|
||||||
SECRET_KEY: ${SECRET_KEY:-change_me_in_production}
|
SECRET_KEY: ${SECRET_KEY:-change_me_in_production}
|
||||||
LOG_LEVEL: ${LOG_LEVEL:-INFO}
|
LOG_LEVEL: ${LOG_LEVEL:-INFO}
|
||||||
DATABASE_URL: mysql+pymysql://harborforge:harborforge_pass@mysql:3306/harborforge
|
DATABASE_URL: mysql+pymysql://harborforge:harborforge_pass@mysql:${MYSQL_PORT:-3306}/harborforge
|
||||||
ports:
|
ports:
|
||||||
- "8000:8000"
|
- "127.0.0.1:${BACKEND_PORT:-8000}:${BACKEND_PORT:-8000}"
|
||||||
|
depends_on:
|
||||||
|
mysql:
|
||||||
|
condition: service_healthy
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -63,15 +68,18 @@ services:
|
|||||||
context: ../HarborForge.Frontend
|
context: ../HarborForge.Frontend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
VITE_WIZARD_PORT: 8080
|
VITE_WIZARD_PORT: ${WIZARD_PORT:-8080}
|
||||||
VITE_WIZARD_HOST: wizard
|
VITE_WIZARD_HOST: wizard
|
||||||
image: harborforge-test-frontend:dev
|
image: harborforge-test-frontend:dev
|
||||||
container_name: harborforge-test-frontend
|
container_name: harborforge-test-frontend
|
||||||
restart: "no"
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
VITE_API_BASE_URL: http://localhost:8000
|
VITE_API_BASE_URL: http://127.0.0.1:${BACKEND_PORT:-8000}
|
||||||
ports:
|
ports:
|
||||||
- "3000:3000"
|
- "127.0.0.1:${FRONTEND_PORT:-3000}:${FRONTEND_PORT:-3000}"
|
||||||
|
depends_on:
|
||||||
|
- wizard
|
||||||
|
- backend
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -83,10 +91,10 @@ services:
|
|||||||
container_name: harborforge-test-runner
|
container_name: harborforge-test-runner
|
||||||
restart: "no"
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
BASE_URL: http://localhost:3000
|
BASE_URL: http://localhost:${FRONTEND_PORT:-3000}
|
||||||
WEB_SERVER_URL: http://localhost:3000
|
WEB_SERVER_URL: http://localhost:${FRONTEND_PORT:-3000}
|
||||||
WIZARD_URL: http://localhost:18080/wizard
|
WIZARD_URL: http://localhost:${WIZARD_PORT:-8080}/wizard
|
||||||
WIZARD_API_URL: http://localhost:18080
|
WIZARD_API_URL: http://localhost:${WIZARD_PORT:-8080}
|
||||||
CHROME_DEBUGGING_PORT: 9222
|
CHROME_DEBUGGING_PORT: 9222
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|||||||
@@ -30,11 +30,11 @@ services:
|
|||||||
- wizard_config:/config
|
- wizard_config:/config
|
||||||
environment:
|
environment:
|
||||||
CONFIG_DIR: /config
|
CONFIG_DIR: /config
|
||||||
LISTEN_ADDR: "0.0.0.0:8080"
|
LISTEN_ADDR: "0.0.0.0:${WIZARD_PORT:-8080}"
|
||||||
MAX_BACKUPS: "5"
|
MAX_BACKUPS: "5"
|
||||||
CORS_ORIGINS: http://frontend:3000
|
CORS_ORIGINS: http://frontend:${FRONTEND_PORT:-3000}
|
||||||
ports:
|
ports:
|
||||||
- "18080:8080"
|
- "127.0.0.1:${WIZARD_PORT:-8080}:${WIZARD_PORT:-8080}"
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -52,7 +52,7 @@ services:
|
|||||||
CONFIG_FILE: harborforge.json
|
CONFIG_FILE: harborforge.json
|
||||||
SECRET_KEY: ${SECRET_KEY:-change_me_in_production}
|
SECRET_KEY: ${SECRET_KEY:-change_me_in_production}
|
||||||
LOG_LEVEL: ${LOG_LEVEL:-INFO}
|
LOG_LEVEL: ${LOG_LEVEL:-INFO}
|
||||||
DATABASE_URL: mysql+pymysql://harborforge:harborforge_pass@mysql:3306/harborforge
|
DATABASE_URL: mysql+pymysql://harborforge:harborforge_pass@mysql:${MYSQL_PORT:-3306}/harborforge
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -61,13 +61,13 @@ services:
|
|||||||
context: ../HarborForge.Frontend
|
context: ../HarborForge.Frontend
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
args:
|
args:
|
||||||
VITE_WIZARD_PORT: 8080
|
VITE_WIZARD_PORT: ${WIZARD_PORT:-8080}
|
||||||
VITE_WIZARD_HOST: wizard
|
VITE_WIZARD_HOST: wizard
|
||||||
image: harborforge-test-frontend:dev
|
image: harborforge-test-frontend:dev
|
||||||
container_name: harborforge-test-frontend
|
container_name: harborforge-test-frontend
|
||||||
restart: "no"
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
VITE_API_BASE_URL: http://backend:8000
|
VITE_API_BASE_URL: http://backend:${BACKEND_PORT:-8000}
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|
||||||
@@ -79,10 +79,10 @@ services:
|
|||||||
container_name: harborforge-test-runner
|
container_name: harborforge-test-runner
|
||||||
restart: "no"
|
restart: "no"
|
||||||
environment:
|
environment:
|
||||||
BASE_URL: http://frontend:3000
|
BASE_URL: http://frontend:${FRONTEND_PORT:-3000}
|
||||||
WEB_SERVER_URL: http://frontend:3000
|
WEB_SERVER_URL: http://frontend:${FRONTEND_PORT:-3000}
|
||||||
WIZARD_URL: http://wizard:8080/wizard
|
WIZARD_URL: http://wizard:${WIZARD_PORT:-8080}/wizard
|
||||||
WIZARD_API_URL: http://wizard:8080
|
WIZARD_API_URL: http://wizard:${WIZARD_PORT:-8080}
|
||||||
CHROME_DEBUGGING_PORT: 9222
|
CHROME_DEBUGGING_PORT: 9222
|
||||||
networks:
|
networks:
|
||||||
- test-network
|
- test-network
|
||||||
|
|||||||
@@ -8,6 +8,14 @@ set -e
|
|||||||
EXPOSE_PORT="off"
|
EXPOSE_PORT="off"
|
||||||
COMPOSE_FILE="docker-compose-frontend.yml"
|
COMPOSE_FILE="docker-compose-frontend.yml"
|
||||||
|
|
||||||
|
# Load environment variables from .env.TEST if exists
|
||||||
|
if [ -f ".env.TEST" ]; then
|
||||||
|
echo "📋 Loading .env.TEST..."
|
||||||
|
set -a
|
||||||
|
source .env.TEST
|
||||||
|
set +a
|
||||||
|
fi
|
||||||
|
|
||||||
# Parse arguments
|
# Parse arguments
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
|
|||||||
Reference in New Issue
Block a user