L_DelOff/AiTools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix deploy

Browse Source
This commit is contained in:
L_DelOff
2026-01-07 19:12:55 +03:00
parent 681cad9cb0
commit f600fa1523
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/deploy-common.bat → cmd/deploy-common.cmd
View File

@@ -1,6 +1,11 @@
@echo off @echo off
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
echo Current directory: %cd%
where docker
where scp
where where
set SSH_SERVER_IP=192.168.10.110 set SSH_SERVER_IP=192.168.10.110
set SSH_SERVER_USER=root set SSH_SERVER_USER=root
set SSH_CERT_PATH=%USERPROFILE%\.ssh\root_jarviceai set SSH_CERT_PATH=%USERPROFILE%\.ssh\root_jarviceai
@@ -12,22 +17,22 @@ set PLATFORM=linux/amd64/v3
REM === Общие настройки === REM === Общие настройки ===
set DOCKERFILE=.\aitools\Dockerfile set DOCKERFILE=.\aitools\Dockerfile
set PATH=.\aitools set DOCKER_PATH=.\aitools
set IMAGE_TAR_NAME=image-aitools.tar set IMAGE_TAR_NAME=image-aitools.tar
set IMAGE_TAR_GZ_NAME=image-aitools.tar.gz set IMAGE_TAR_GZ_NAME=image-aitools.tar.gz
REM === Проверка запущен ли Docker Daemon === REM REM === Проверка запущен ли Docker Daemon ===
echo Checking if Docker is running... REM echo Checking if Docker is running...
docker version >nul 2>&1 REM docker version >nul 2>&1
if !errorlevel! neq 0 ( REM if !errorlevel! neq 0 (
echo ERROR: Docker is not running or not installed! REM echo ERROR: Docker is not running or not installed!
echo Please start Docker Desktop and try again. REM echo Please start Docker Desktop and try again.
echo. REM echo.
echo If Docker is installed, ensure it's running in the system tray. REM echo If Docker is installed, ensure it's running in the system tray.
echo You may need to restart Docker Desktop. REM echo You may need to restart Docker Desktop.
pause REM pause
exit /b 1 REM exit /b 1
) REM )
REM === Проверка наличия .env === REM === Проверка наличия .env ===
@@ -50,7 +55,7 @@ for /f "usebackq tokens=*" %%a in ("%TMP_ENV_ARGS%") do (
set BUILD_ARGS=!BUILD_ARGS! %%a set BUILD_ARGS=!BUILD_ARGS! %%a
) )
echo Building image locally with build args... echo Building image locally with build args...
docker build --platform "%PLATFORM%" -f "%DOCKERFILE%" -t "%IMAGE_NAME%" --progress=plain !BUILD_ARGS! "%PATH%" docker build --platform "%PLATFORM%" -f "%DOCKERFILE%" -t "%IMAGE_NAME%" --progress=plain !BUILD_ARGS! "%DOCKER_PATH%"
REM === Экспорт образов в tar === REM === Экспорт образов в tar ===
echo Creating tar archives of images... echo Creating tar archives of images...
@@ -95,7 +100,7 @@ echo Creating directory on server and moving files...
ssh -i "%SSH_CERT_PATH%" "%SSH_SERVER_USER%@%SSH_SERVER_IP%" "mkdir -p /opt/aitools && mv -f /tmp/docker-compose.yaml /opt/aitools/docker-compose.yaml && mv -f /tmp/.env /opt/aitools/.env && echo 'Files moved'" ssh -i "%SSH_CERT_PATH%" "%SSH_SERVER_USER%@%SSH_SERVER_IP%" "mkdir -p /opt/aitools && mv -f /tmp/docker-compose.yaml /opt/aitools/docker-compose.yaml && mv -f /tmp/.env /opt/aitools/.env && echo 'Files moved'"
echo Loading images on server and starting... echo Loading images on server and starting...
ssh -i "%SSH_CERT_PATH%" "%SSH_SERVER_USER%@%SSH_SERVER_IP%" "docker stop aitools 2>/dev/null || true && docker rm aitools 2>/dev/null || true && docker load < /tmp/%IMAGE% && rm /tmp/%IMAGE% && && cd /opt/aitools && docker compose up -d && echo 'Deployment completed!'" ssh -i "%SSH_CERT_PATH%" "%SSH_SERVER_USER%@%SSH_SERVER_IP%" "docker stop aitools 2>/dev/null || true && docker rm aitools 2>/dev/null || true && docker load < /tmp/%IMAGE% && rm /tmp/%IMAGE% && cd /opt/aitools && docker compose up -d && echo 'Deployment completed!'"
REM === Очистка локальных файлов === REM === Очистка локальных файлов ===
echo Cleaning local archives... echo Cleaning local archives...