Compare commits
2 Commits
ac11580eb3
...
306413ca56
| Author | SHA1 | Date | |
|---|---|---|---|
| 306413ca56 | |||
| b1453ff249 |
38
setup.bat
38
setup.bat
@@ -147,15 +147,41 @@ echo.
|
|||||||
|
|
||||||
REM Step 6: Wait for database
|
REM Step 6: Wait for database
|
||||||
if "%DB%"=="mysql" (
|
if "%DB%"=="mysql" (
|
||||||
echo Waiting for database...
|
echo Waiting for MySQL to be ready...
|
||||||
timeout /t 5 /nobreak >nul
|
set DB_READY=0
|
||||||
echo Database ready
|
for /L %%i in (1,1,30) do (
|
||||||
|
docker-compose exec -T app php -r "new PDO('mysql:host=mysql;dbname=laravel', 'laravel', 'secret');" >nul 2>&1
|
||||||
|
if !errorlevel! equ 0 (
|
||||||
|
set DB_READY=1
|
||||||
|
goto :mysql_ready
|
||||||
|
)
|
||||||
|
timeout /t 1 /nobreak >nul
|
||||||
|
)
|
||||||
|
:mysql_ready
|
||||||
|
if !DB_READY! equ 1 (
|
||||||
|
echo MySQL ready
|
||||||
|
) else (
|
||||||
|
echo WARNING: MySQL may not be fully ready yet
|
||||||
|
)
|
||||||
echo.
|
echo.
|
||||||
)
|
)
|
||||||
if "%DB%"=="pgsql" (
|
if "%DB%"=="pgsql" (
|
||||||
echo Waiting for database...
|
echo Waiting for PostgreSQL to be ready...
|
||||||
timeout /t 5 /nobreak >nul
|
set DB_READY=0
|
||||||
echo Database ready
|
for /L %%i in (1,1,30) do (
|
||||||
|
docker-compose exec -T app php -r "new PDO('pgsql:host=pgsql;dbname=laravel', 'laravel', 'secret');" >nul 2>&1
|
||||||
|
if !errorlevel! equ 0 (
|
||||||
|
set DB_READY=1
|
||||||
|
goto :pgsql_ready
|
||||||
|
)
|
||||||
|
timeout /t 1 /nobreak >nul
|
||||||
|
)
|
||||||
|
:pgsql_ready
|
||||||
|
if !DB_READY! equ 1 (
|
||||||
|
echo PostgreSQL ready
|
||||||
|
) else (
|
||||||
|
echo WARNING: PostgreSQL may not be fully ready yet
|
||||||
|
)
|
||||||
echo.
|
echo.
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
23
setup.sh
23
setup.sh
@@ -138,10 +138,25 @@ echo -e "${GREEN}✓ App container ready${NC}"
|
|||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
# Step 6: Wait for database
|
# Step 6: Wait for database
|
||||||
if [ "$DB" = "mysql" ] || [ "$DB" = "pgsql" ]; then
|
if [ "$DB" = "mysql" ]; then
|
||||||
echo -e "${YELLOW}→ Waiting for database...${NC}"
|
echo -e "${YELLOW}→ Waiting for MySQL to be ready...${NC}"
|
||||||
sleep 5
|
for i in {1..30}; do
|
||||||
echo -e "${GREEN}✓ Database ready${NC}"
|
if docker-compose exec -T app php -r "new PDO('mysql:host=mysql;dbname=laravel', 'laravel', 'secret');" >/dev/null 2>&1; then
|
||||||
|
echo -e "${GREEN}✓ MySQL ready${NC}"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
echo ""
|
||||||
|
elif [ "$DB" = "pgsql" ]; then
|
||||||
|
echo -e "${YELLOW}→ Waiting for PostgreSQL to be ready...${NC}"
|
||||||
|
for i in {1..30}; do
|
||||||
|
if docker-compose exec -T app php -r "new PDO('pgsql:host=pgsql;dbname=laravel', 'laravel', 'secret');" >/dev/null 2>&1; then
|
||||||
|
echo -e "${GREEN}✓ PostgreSQL ready${NC}"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
echo ""
|
echo ""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user