Fix some bugs runtime
This commit is contained in:
+85
-37
@@ -1,7 +1,21 @@
|
||||
@echo off
|
||||
setlocal EnableDelayedExpansion
|
||||
|
||||
:: ============================================================================
|
||||
:: CONFIGURATION (RESOLVE PARENT ROOT DIRECTORY FROM /scripts)
|
||||
:: ============================================================================
|
||||
set "SCRIPT_DIR=%~dp0"
|
||||
for %%I in ("%SCRIPT_DIR%..") do set "ROOT_DIR=%%~fI\"
|
||||
set "CLEAN_ROOT=%ROOT_DIR:~0,-1%"
|
||||
|
||||
set "WSL_DISTRO=Ubuntu-22.04"
|
||||
set "PROJECT_DIR=/opt/walmart"
|
||||
set "REGISTRY_URL=gitea.digitoolsolutions.synology.me"
|
||||
set "KIOSK_APP_DIR=C:\KioskApp"
|
||||
|
||||
:: ============================================================================
|
||||
:: 0. AUTO-ELEVATE TO ADMINISTRATOR
|
||||
:: ============================================================================
|
||||
net session >nul 2>&1
|
||||
if %errorLevel% neq 0 (
|
||||
echo Requesting Administrator privileges...
|
||||
@@ -9,55 +23,89 @@ if %errorLevel% neq 0 (
|
||||
exit /b
|
||||
)
|
||||
|
||||
set "SCRIPT_DIR=%~dp0"
|
||||
for %%I in ("%SCRIPT_DIR%..") do set "ROOT_DIR=%%~fI\"
|
||||
echo ============================================================================
|
||||
echo DTS TORQUE VAULT - SYSTEM UPDATE (CONTAINERS AND KIOSK SHELL)
|
||||
echo ============================================================================
|
||||
echo.
|
||||
|
||||
set "WSL_DISTRO=Ubuntu-22.04"
|
||||
set "PROJECT_DIR=/opt/walmart"
|
||||
set "KIOSK_APP_DIR=C:\KioskApp"
|
||||
|
||||
echo ============================================
|
||||
echo Updating Walmart containers & Kiosk splash...
|
||||
echo ============================================
|
||||
|
||||
for %%F in ("compose.yml" ".env" "templates\startup.html") do (
|
||||
if not exist "%ROOT_DIR%%%~F" (
|
||||
echo [ERROR] Missing required file: "%ROOT_DIR%%%~F"
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
)
|
||||
|
||||
for /f "delims=" %%i in ('wsl -d %WSL_DISTRO% -u root wslpath -a "%ROOT_DIR%"') do set "WSL_ROOT_DIR=%%i"
|
||||
|
||||
echo [1/4] Updating config files and Kiosk startup template...
|
||||
if not exist "%KIOSK_APP_DIR%" mkdir "%KIOSK_APP_DIR%"
|
||||
copy /Y "%ROOT_DIR%templates\startup.html" "%KIOSK_APP_DIR%\startup.html" >nul
|
||||
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "mkdir -p %PROJECT_DIR% && cp '%WSL_ROOT_DIR%/compose.yml' %PROJECT_DIR%/ && cp '%WSL_ROOT_DIR%/.env' %PROJECT_DIR%/"
|
||||
:: ============================================================================
|
||||
:: 1. PRE-FLIGHT CHECK
|
||||
:: ============================================================================
|
||||
ping -n 1 8.8.8.8 >nul 2>&1
|
||||
if %errorLevel% neq 0 (
|
||||
echo [ERROR] Failed to copy config files into WSL. Is %WSL_DISTRO% installed?
|
||||
echo [ERROR] No Internet connection detected! Connect LAN/Wi-Fi and run again.
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
echo [2/4] Pulling latest images...
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "cd %PROJECT_DIR% && docker compose pull"
|
||||
wsl -d %WSL_DISTRO% -u root true >nul 2>&1
|
||||
if %errorLevel% neq 0 (
|
||||
echo [ERROR] Failed to pull Docker images. Check Internet or Docker login session.
|
||||
echo [ERROR] WSL distribution "%WSL_DISTRO%" is not installed. Run install.bat first.
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
echo [3/4] Restarting containers...
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "cd %PROJECT_DIR% && docker compose up -d"
|
||||
:: ============================================================================
|
||||
:: 2. UPDATE KIOSK STARTUP PAGE (IF PRESENT)
|
||||
:: ============================================================================
|
||||
echo [1/4] Updating Kiosk startup template...
|
||||
if exist "%ROOT_DIR%templates\startup.html" (
|
||||
if not exist "%KIOSK_APP_DIR%" mkdir "%KIOSK_APP_DIR%"
|
||||
copy /Y "%ROOT_DIR%templates\startup.html" "%KIOSK_APP_DIR%\startup.html" >nul
|
||||
icacls "%KIOSK_APP_DIR%" /grant "Users:(OI)(CI)RX" /T >nul
|
||||
echo - Updated %KIOSK_APP_DIR%\startup.html
|
||||
) else (
|
||||
echo - Skipped (templates\startup.html not found in package)
|
||||
)
|
||||
|
||||
echo [4/4] Cleaning up unused images...
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "docker image prune -af"
|
||||
:: ============================================================================
|
||||
:: 3. SYNC COMPOSE.YML AND .ENV INTO WSL
|
||||
:: ============================================================================
|
||||
echo [2/4] Syncing compose.yml and .env to %PROJECT_DIR%...
|
||||
for /f "delims=" %%i in ('wsl -d %WSL_DISTRO% -u root wslpath -a "%CLEAN_ROOT%"') do set "WSL_ROOT_DIR=%%i"
|
||||
|
||||
if exist "%ROOT_DIR%compose.yml" (
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "mkdir -p %PROJECT_DIR% && cp '%WSL_ROOT_DIR%/compose.yml' %PROJECT_DIR%/"
|
||||
echo - Synced compose.yml
|
||||
)
|
||||
|
||||
if exist "%ROOT_DIR%.env" (
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "cp '%WSL_ROOT_DIR%/.env' %PROJECT_DIR%/ && sed -i 's/\r$//' %PROJECT_DIR%/.env"
|
||||
echo - Synced and normalized .env
|
||||
) else (
|
||||
echo - Kept existing %PROJECT_DIR%/.env on device
|
||||
)
|
||||
|
||||
:: ============================================================================
|
||||
:: 4. PULL LATEST DOCKER IMAGES AND RECREATE CONTAINERS
|
||||
:: ============================================================================
|
||||
echo [3/4] Pulling latest Docker images and recreating containers...
|
||||
wsl -d %WSL_DISTRO% -u root service docker start >nul 2>&1
|
||||
wsl -d %WSL_DISTRO% -u root docker login %REGISTRY_URL%
|
||||
if %errorLevel% neq 0 (
|
||||
echo [ERROR] Docker registry login failed.
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "cd %PROJECT_DIR% && docker compose pull && docker compose up -d --remove-orphans"
|
||||
if %errorLevel% neq 0 (
|
||||
echo [ERROR] Failed to update Docker containers.
|
||||
pause
|
||||
exit /b 1
|
||||
)
|
||||
|
||||
:: ============================================================================
|
||||
:: 5. CLEANUP UNUSED DOCKER IMAGES
|
||||
:: ============================================================================
|
||||
echo [4/4] Cleaning up dangling/unused Docker images...
|
||||
wsl -d %WSL_DISTRO% -u root docker image prune -f >nul 2>&1
|
||||
|
||||
echo.
|
||||
echo ============================================
|
||||
echo Walmart update completed!
|
||||
echo ============================================
|
||||
wsl -d %WSL_DISTRO% -u root bash -c "docker ps"
|
||||
echo ============================================================================
|
||||
echo UPDATE COMPLETED SUCCESSFULLY!
|
||||
echo - All containers are up to date and running in %PROJECT_DIR%
|
||||
echo - Database and Kiosk user configuration were preserved
|
||||
echo ============================================================================
|
||||
echo.
|
||||
pause
|
||||
Reference in New Issue
Block a user