diff --git a/build-release.bat b/build-release.bat index 3129236a..8439e3ea 100644 --- a/build-release.bat +++ b/build-release.bat @@ -27,16 +27,24 @@ set m=CLIENT FAILED TO COPY goto FAIL ) -@echo ******************** BUILD LINUX DOCKER ********************** -rmdir C:\data\code\raven\dist\docker\linux-x64\ayanovadocker\files /s/q -mkdir C:\data\code\raven\dist\docker\linux-x64\ayanovadocker\files +@echo ******************** BUILD LINUX x64 ************************** +rmdir C:\data\code\raven\dist\linux-x64 /s/q +mkdir C:\data\code\raven\dist\linux-x64 cd C:\data\code\raven\server\AyaNova\ -dotnet publish -o C:\data\code\raven\dist\docker\linux-x64\ayanovadocker\files\ -c Release -r linux-x64 --no-self-contained +dotnet publish -o C:\data\code\raven\dist\linux-x64\ -c Release -r linux-x64 --no-self-contained IF %ERRORLEVEL% NEQ 0 ( -set m=BUILD LINUX DOCKER FAILED +set m=BUILD LINUX x64 FAILED goto FAIL ) +rem Create linux x64 a docker and bare from linux build +rem clean out docker files folder +rmdir C:\data\code\raven\dist\docker\linux-x64\ayanovadocker\files /s/q +mkdir C:\data\code\raven\dist\docker\linux-x64\ayanovadocker\files +xcopy C:\data\code\raven\dist\linux-x64\*.* C:\data\code\raven\dist\docker\linux-x64\ayanovadocker\files /s /e +"C:\Program Files\7-Zip\7z.exe" + + @echo ************** BUILD WINDOWS STANDALONE SERVER *********************** rmdir C:\data\code\raven\dist\win-x64\ayanova\standalone /s/q mkdir C:\data\code\raven\dist\win-x64\ayanova\standalone diff --git a/dist/docker/linux-x64/docker-compose.yml b/dist/docker/linux-x64/docker-compose.yml index b367fecf..f1bcbb83 100644 --- a/dist/docker/linux-x64/docker-compose.yml +++ b/dist/docker/linux-x64/docker-compose.yml @@ -29,8 +29,7 @@ services: AYANOVA_TEMP_FILES_PATH: /var/lib/ayanova/files/temp AYANOVA_LOG_PATH: /var/lib/ayanova AYANOVA_LOG_LEVEL: Info - #AYANOVA_REPORT_RENDERING_TIMEOUT: 5000 - #AYANOVA_PERMANENTLY_ERASE_DATABASE: "true" + AYANOVA_REPORT_RENDER_BROWSER_PATH: /usr/bin/chromium-browser build: context: ./ayanovadocker dockerfile: Dockerfile