Commit Graph

239 Commits

Author SHA1 Message Date
7e05d72b01 Fix issue with installing vcredist 2023-11-01 11:02:05 +05:00
b5242f5b53 Add debuginfo into docker image 2023-10-31 15:08:54 +03:00
Nasrullo Nurullaev
cca908fe0f
fix Bug 64516 - Fix issue with healthcheck logs (#29) 2023-10-27 12:31:22 +03:00
Danil Titarenko
330cffc88b
Fix docker daemon sed modifier (#26) 2023-10-27 12:09:56 +03:00
2ea1908677 Merge branch 'release/v2.0.0' into feature/new-scripts-docker-dev-python 2023-10-26 12:42:35 +04:00
Nasrullo Nurullaev
c6fb634e69
fix Bug 64405 - Fix issue with starting services (#27)
* fix Bug 64405 - Fix issue with starting services

* Small fixes
2023-10-23 17:02:20 +03:00
0075961d5a Added new python scripts 2023-10-18 18:07:33 +04:00
Nasrullo Nurullaev
b2f2890fbc
Increase the generation of MACHINE_KEY length (#21) 2023-10-17 14:41:21 +03:00
Nasrullo Nurullaev
8773eeeb29
fix Bug 64516 - Fix issue with infinite logs in EventViewer (#19) 2023-10-17 12:17:46 +03:00
Nasrullo Nurullaev
5971f66ff6
Fix issue with machinekey when updating DocSpace (#18) 2023-10-17 11:02:12 +03:00
04d28e7b73
Feature/doc space enterprise (#17)
* Add Enterprise build and bundled prerequisites

* Small fixes

* Small fixes

* Fix issue with Licenses

* Revert changes with License_Redist.rtf

---------

Co-authored-by: Nasrullo Nurullaev <nasrullo.nurullaev@onlyoffice.com>
2023-10-16 17:57:50 +03:00
e7c6fe6b79 Fix openresty logging error in nginx file 2023-10-12 17:11:05 +04:00
28dffc0d8e Added env MIGRATION_TYPE 2023-10-11 18:26:30 +04:00
6f64729531
Fix the use of the default openresty config (#13) 2023-10-10 18:18:22 +03:00
d7322464af
Correct the paths for downloading OCI scripts (#11) 2023-10-10 18:16:28 +03:00
ca41aedeb8
Refactoring build rpm packages (#9) 2023-10-10 16:48:27 +03:00
5095fa01d7
Add fix for git clone building images (#6)
* Fix git clone for building docker image

* Modify git clone feature for docker build
2023-10-10 09:48:01 +03:00
Nasrullo Nurullaev
a616b3b6d2
Refactor windows build (#10)
* Refactor builds for windows

* Change web build directories

* Directory fix

* build to buildtools

* Small fixes

* Fix issue with building Utils.csproj

* Fix issue with nuget packages

* Remove sed temp files from directory
2023-10-09 15:38:14 +03:00
46127d3b7e
Fix incorrect log level substitution (#8) 2023-10-09 10:54:49 +03:00
DmitrySychugov
7f302d777d Merge branch 'develop' into feature/management 2023-10-05 19:18:55 +05:00
0142e65f97 Fix dnsmasq run 2023-10-05 17:48:54 +04:00
897ccd9033
Add the ability to set a pass for redis in router (#5)
* Add the ability to set a pass for redis in router

* Add redis_password to compose
2023-10-05 16:16:10 +03:00
DmitrySychugov
0266838db5 Merge branch 'develop' into feature/management
# Conflicts:
#	build.backend.docker.sh
#	build.static.bat
#	common/ASC.Api.Core/Security/EmailValidationKeyModelHelper.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Core/TenantRegistrationInfo.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/Contracts/BackupServiceModel.cs
#	common/ASC.Data.Backup.Core/EF/Model/BackupSchedule.cs
#	common/ASC.Data.Backup.Core/IntegrationEvents/Events/BackupRequestIntegrationEvent.cs
#	common/ASC.Data.Backup.Core/Service/BackupService.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
#	common/services/ASC.ApiSystem/ASC.ApiSystem.csproj
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ApiSystem/Controllers/SettingsController.cs
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Models/SettingsModel.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup/Api/BackupController.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupDto.cs
#	common/services/ASC.Data.Backup/ApiModels/BackupScheduleDto.cs
#	common/services/ASC.Data.Backup/GlobalUsings.cs
#	frontend.code-workspace
#	frontend.macos.code-workspace
#	migrations/mysql/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	migrations/postgre/SaaS/MigrationContext/MigrationContextModelSnapshot.cs
#	package.json
#	packages/client/package.json
#	packages/client/src/components/MainBar/index.js
#	packages/client/src/components/NavMenu/index.js
#	packages/client/src/components/NavMenu/sub-components/header-nav.js
#	packages/client/src/components/NavMenu/sub-components/header.js
#	packages/client/src/pages/Confirm/sub-components/auth.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
#	packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
#	packages/client/src/pages/PortalSettings/categories/common/branding.js
#	packages/client/src/pages/PortalSettings/categories/common/sub-components/loaderWhiteLabel.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/backup-list/index.js
#	packages/client/src/pages/PortalSettings/categories/data-management/index.js
#	packages/client/src/pages/PortalSettings/categories/integration/SingleSignOn/index.js
#	packages/client/src/store/ProfileActionsStore.js
#	packages/client/webpack.config.js
#	packages/common/api/index.js
#	packages/common/api/portal/index.js
#	packages/common/components/Article/index.js
#	packages/common/components/Article/sub-components/article-apps.js
#	packages/common/components/Article/sub-components/article-header.js
#	packages/common/components/Article/sub-components/article-hide-menu-button.js
#	packages/common/components/Article/sub-components/article-profile.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/axiosClient.js
#	packages/common/utils/whiteLabelHelper.js
#	packages/components/context-menu/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
#	public/locales/en/Common.json
#	public/scripts/config.json
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	yarn.lock
2023-10-04 21:06:09 +05:00
36caae2baa
Fix entrypoint in nginx (#4) 2023-10-04 17:05:30 +03:00
b099c11535 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace-buildtools into develop 2023-10-03 19:40:21 +04:00
49faa6de95 Fix build docker dev (disabled ASC.TelegramReports) 2023-10-03 19:39:24 +04:00
db6a7eec48
Merge pull request #3 from ONLYOFFICE/master
Merge master into develop
2023-10-03 18:33:28 +03:00
bc9f96ee7d Fix bad merge 2023-10-03 19:13:51 +04:00
78a222ebd1 merge from develop 2023-10-03 17:38:22 +03:00
cef367ef23 Fix path for build 2023-10-03 17:05:32 +03:00
67fd083eec Modify path for docker build 2023-10-03 16:28:10 +03:00
247bcd6fd2 path modify 2023-10-03 11:23:55 +03:00
88c8ca3bf8 path modify 2023-10-03 11:19:49 +03:00
e1d0bb5f1d Applied chmod +x for *.sh scripts
Issue: OCI runtime create failed: permission denied: unknown
2023-10-03 11:29:50 +04:00
1584336d5f replace build => buildtools 2023-10-02 18:09:10 +03:00
c0ccfb0a6a Fixed scripts on windows 2023-10-02 17:14:17 +03:00
de67295456 change build => buildtools path 2023-10-02 17:10:08 +03:00
dedb8cf3b3 Updated paths and permissions 2023-10-02 16:52:30 +04:00
25241c61d4 drop all files for backend/frontend 2023-10-02 13:23:37 +03:00