Merge pull request 'feature/role-permission-system' (#1) from feature/role-permission-system into master
Reviewed-on: #1
This commit was merged in pull request #1.
This commit is contained in:
4
.gitmodules
vendored
4
.gitmodules
vendored
@@ -1,6 +1,6 @@
|
|||||||
[submodule "HarborForge.Backend.Test"]
|
[submodule "HarborForge.Backend.Test"]
|
||||||
path = HarborForge.Backend.Test
|
path = HarborForge.Backend.Test
|
||||||
url = https://zhi:rT5Wjw24mV4all38fIoNQfl2@git.hangman-lab.top/zhi/HarborForge.Backend.Test.git
|
url = https://git.hangman-lab.top/zhi/HarborForge.Backend.Test.git
|
||||||
[submodule "HarborForge.Frontend.Test"]
|
[submodule "HarborForge.Frontend.Test"]
|
||||||
path = HarborForge.Frontend.Test
|
path = HarborForge.Frontend.Test
|
||||||
url = https://zhi:rT5Wjw24mV4all38fIoNQfl2@git.hangman-lab.top/zhi/HarborForge.Frontend.Test.git
|
url = https://git.hangman-lab.top/zhi/HarborForge.Frontend.Test.git
|
||||||
|
|||||||
Submodule HarborForge.Frontend.Test updated: e8ffed41ee...3b30119317
@@ -58,6 +58,11 @@ echo "📦 Using compose file: $COMPOSE_FILE"
|
|||||||
echo "🧹 Cleaning up previous containers..."
|
echo "🧹 Cleaning up previous containers..."
|
||||||
docker compose -f "$COMPOSE_FILE" down -v 2>/dev/null || true
|
docker compose -f "$COMPOSE_FILE" down -v 2>/dev/null || true
|
||||||
|
|
||||||
|
# Build frontend with correct API base URL (force no cache, remove image first)
|
||||||
|
echo "🔨 Building frontend..."
|
||||||
|
docker rmi harborforge-test-frontend:dev 2>/dev/null || true
|
||||||
|
docker compose -f "$COMPOSE_FILE" build --no-cache --build-arg VITE_API_BASE=http://backend:8000 frontend
|
||||||
|
|
||||||
# Start services
|
# Start services
|
||||||
echo "📦 Starting services..."
|
echo "📦 Starting services..."
|
||||||
docker compose -f "$COMPOSE_FILE" up -d
|
docker compose -f "$COMPOSE_FILE" up -d
|
||||||
@@ -83,7 +88,7 @@ echo "✅ Services ready!"
|
|||||||
|
|
||||||
# Run test
|
# Run test
|
||||||
echo "🧪 Running test..."
|
echo "🧪 Running test..."
|
||||||
docker compose -f "$COMPOSE_FILE" run --rm test
|
docker compose -f "$COMPOSE_FILE" run --rm -e WORKERS=1 test
|
||||||
TEST_EXIT_CODE=$?
|
TEST_EXIT_CODE=$?
|
||||||
|
|
||||||
# Cleanup decision based on expose-port
|
# Cleanup decision based on expose-port
|
||||||
|
|||||||
Reference in New Issue
Block a user