diff --git a/cmd/deploy-common.bat b/cmd/deploy-common.cmd similarity index 80% rename from cmd/deploy-common.bat rename to cmd/deploy-common.cmd index 7f74ff4..3ccdebc 100644 --- a/cmd/deploy-common.bat +++ b/cmd/deploy-common.cmd @@ -1,6 +1,11 @@ @echo off setlocal enabledelayedexpansion +echo Current directory: %cd% +where docker +where scp +where where + set SSH_SERVER_IP=192.168.10.110 set SSH_SERVER_USER=root set SSH_CERT_PATH=%USERPROFILE%\.ssh\root_jarviceai @@ -12,22 +17,22 @@ set PLATFORM=linux/amd64/v3 REM === Общие настройки === set DOCKERFILE=.\aitools\Dockerfile -set PATH=.\aitools +set DOCKER_PATH=.\aitools set IMAGE_TAR_NAME=image-aitools.tar set IMAGE_TAR_GZ_NAME=image-aitools.tar.gz -REM === Проверка запущен ли Docker Daemon === -echo Checking if Docker is running... -docker version >nul 2>&1 -if !errorlevel! neq 0 ( - echo ERROR: Docker is not running or not installed! - echo Please start Docker Desktop and try again. - echo. - echo If Docker is installed, ensure it's running in the system tray. - echo You may need to restart Docker Desktop. - pause - exit /b 1 -) +REM REM === Проверка запущен ли Docker Daemon === +REM echo Checking if Docker is running... +REM docker version >nul 2>&1 +REM if !errorlevel! neq 0 ( +REM echo ERROR: Docker is not running or not installed! +REM echo Please start Docker Desktop and try again. +REM echo. +REM echo If Docker is installed, ensure it's running in the system tray. +REM echo You may need to restart Docker Desktop. +REM pause +REM exit /b 1 +REM ) REM === Проверка наличия .env === @@ -50,7 +55,7 @@ for /f "usebackq tokens=*" %%a in ("%TMP_ENV_ARGS%") do ( set BUILD_ARGS=!BUILD_ARGS! %%a ) 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 === 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'" 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 === Очистка локальных файлов === echo Cleaning local archives...