Commit Graph

401 Commits

Author SHA1 Message Date
Sergey Kirichenko
ccf2ea0302 Fix 2022-06-08 12:17:36 +03:00
Sergey Kirichenko
7529aabaca Modify docker build 2022-06-07 10:37:38 +03:00
Sergey Kirichenko
22f158bcbb Del build docker image ASC.Thumbnails 2022-06-02 14:48:34 +03:00
Sergey Kirichenko
0d714d89b4 Fix build 2022-06-02 12:08:50 +03:00
Sergey Kirichenko
c9a9746ef4 Del build storage-migration, storage-encryption 2022-06-02 11:28:39 +03:00
Sergey Kirichenko
be23489069 Modify build docker services 2022-06-02 10:50:36 +03:00
Sergey Kirichenko
dd77ba43d2 Fix 2022-06-01 17:04:02 +03:00
Sergey Kirichenko
6127118f63 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into feature/appserver-develop-docker-build 2022-06-01 11:00:27 +03:00
Sergey Kirichenko
bae7a6a1cb Modify docker-entrypoint run file 2022-06-01 09:48:55 +03:00
Sergey Kirichenko
a6f672398e Fix 2022-05-31 10:37:28 +03:00
Sergey Kirichenko
65e5074fd9 Fix build ASC.SsoAuth 2022-05-31 08:37:13 +03:00
Sergey Kirichenko
907e3222d6 Modify docker image building 2022-05-30 23:21:45 +03:00
Sergey Kirichenko
3d0d56d0fd Modify docker-entrypoint 2022-05-25 12:00:22 +03:00
Sergey Kirichenko
fd9b837edc Fix build 2022-05-25 11:55:07 +03:00
Sergey Kirichenko
3dcd1048b9 Build 2022-05-24 12:16:47 +03:00
Eugene Kozyrev
4929c5f343
Upgrade ZooKeeper version to 3.7.1 in Windows installation (#637)
* Upgrade ZooKeeper version to 3.7.1

* Add versions variables
2022-05-12 19:06:09 +03:00
1dff9e18c4 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
Eugene Kozyrev
ff7b192dbf
Change kafka-zookeeper projects language (#626)
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-04-21 12:06:15 +03:00
b877354203 BackupBackgroundTasks: port changed 2022-04-13 19:13:37 +03:00
Eugene Kozyrev
3b3f20db29
Add MySQL Installer Runner signing (#618) 2022-04-13 11:41:45 +03:00
Eugene Kozyrev
542df3d847
Change project language (#612) 2022-04-08 16:04:09 +03:00
Eugene Kozyrev
4012a9b713
Add ZooKeeper and Kafka connection check on Windows installation (#610)
* Add zookeeper/kafka connection check

* Edit build script
2022-04-08 13:04:51 +03:00
Eugene Kozyrev
5220e96b7e
Add elasticsearch connection check (#606) 2022-04-06 11:17:26 +03:00
Eugene Kozyrev
83ba7b1882
Add Windows installation files (#601)
* Add installation files

* Add DB migration

* Add deleting publish directory and back files

* Edit typo in DATABASE_MIGRATION property

* Delete sql scripts downloading
2022-04-01 16:43:34 +03:00
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
Sergey Kirichenko
8940c0312a
Add feature for building images for different architecture (#600)
* Fix config

* del services, add migration env

* Fix build

* Fix sed

* Fix

* Delete commented code
2022-03-29 15:39:54 +03:00
868492b562 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Billing/BillingClient.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Notify/Context.cs
#	common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
#	common/ASC.FederatedLogin/Helpers/RequestHelper.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Helpers/DocuSignHelper.cs
#	products/ASC.Files/Core/Helpers/EasyBibHelper.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2022-03-19 22:16:03 +03:00
69a6ed4d46
Bugfix/packages correction (#583)
* Add templates

* Add a launch of the configuration script to the postinst

* Edit OneClickInstall for new changes

* Correct appserver-configuration.sh

* chown fix

* Correction debconf-set-selections

* Fix the launch of services after installation

* test

* Correction for database values

* Add variables for mysql configuration

* Revert "test"

This reverts commit 85e5050eb2cfeb1b3723076e44ec0819e0889142.

* Add launch of zookeeper and kafka services
2022-03-14 11:26:24 +03:00
0f3ce16f85 create new winsw.exe
fix logs
2022-03-09 14:34:28 +03:00
ea8e68c950 add ssoAuth.bat with yarn install 2022-03-04 16:50:12 +03:00
2c526259d3 winsw: update
fix names
add start mode
remove log settings (don't work. always create log how like "append" mode)
add stop before uninstall
2022-03-04 12:14:46 +03:00
34fc3e545d rename winsw services and delete socket.io.bat 2022-03-01 15:46:31 +03:00
88c7f5ba72 Merge branch 'feature/backend-refactor' into feature/winsw 2022-02-25 11:18:26 +03:00
b5b8b1edf0 added support scheduler backup request handling 2022-02-24 19:53:49 +03:00
63d163cba6 winsw: socket.io 2022-02-24 16:50:02 +03:00
7f70d0be04 Merge branch 'feature/backend-refactor' into feature/winsw 2022-02-24 14:50:18 +03:00
707739813c winsw: SsoAuth 2022-02-24 14:46:55 +03:00
d4e48004bc added socketio 2022-02-24 13:47:18 +03:00
d157dd637e Build: Removed old products nginx configs 2022-02-22 18:23:56 +03:00
ac0e314f60 winsw: refactoring
update bats
relocate xml and exe
2022-02-22 15:45:21 +03:00
b8b23d266d winsw: update bats 2022-02-22 13:15:02 +03:00
3aeac42444 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/services/ASC.ElasticSearch/Engine/FactoryIndexer.cs
#	common/services/ASC.ElasticSearch/Service/Settings.cs
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
#	common/services/ASC.Socket.IO.Svc/SocketServiceLauncher.cs
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	packages/asc-web-components/table-container/TableRow.js
#	products/ASC.Files/Client/public/locales/az/Home.json
#	products/ASC.Files/Client/public/locales/bg/Home.json
#	products/ASC.Files/Client/public/locales/bg/Translations.json
#	products/ASC.Files/Client/public/locales/cs/Home.json
#	products/ASC.Files/Client/public/locales/de/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/de/Home.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/de/UploadPanel.json
#	products/ASC.Files/Client/public/locales/el/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/el/Home.json
#	products/ASC.Files/Client/public/locales/en/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/en/Home.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/en/UploadPanel.json
#	products/ASC.Files/Client/public/locales/es/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/es/Home.json
#	products/ASC.Files/Client/public/locales/es/UploadPanel.json
#	products/ASC.Files/Client/public/locales/fi/Home.json
#	products/ASC.Files/Client/public/locales/fr/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/fr/Home.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/it/Home.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/it/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ja/Home.json
#	products/ASC.Files/Client/public/locales/ja/UploadPanel.json
#	products/ASC.Files/Client/public/locales/lv/Home.json
#	products/ASC.Files/Client/public/locales/nl/Home.json
#	products/ASC.Files/Client/public/locales/nl/Translations.json
#	products/ASC.Files/Client/public/locales/pl/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/pt-BR/Home.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Home.json
#	products/ASC.Files/Client/public/locales/ro/UploadPanel.json
#	products/ASC.Files/Client/public/locales/ru/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/ru/Home.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/ru/UploadPanel.json
#	products/ASC.Files/Client/public/locales/sk/Home.json
#	products/ASC.Files/Client/public/locales/tr/Home.json
#	products/ASC.Files/Client/public/locales/uk/Home.json
#	products/ASC.Files/Client/public/locales/vi/ConvertDialog.json
#	products/ASC.Files/Client/public/locales/vi/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/Home.json
#	products/ASC.Files/Client/public/locales/zh-CN/UploadPanel.json
#	products/ASC.Files/Client/src/HOCs/withBadges.js
#	products/ASC.Files/Client/src/HOCs/withContent.js
#	products/ASC.Files/Client/src/components/Badges.js
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/ThumbnailSettings.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Client/src/pages/Home/Section/Body/TableView/TableRow.js
#	public/locales/de/Common.json
2022-02-21 22:22:38 +03:00
5c7e46b9ab winsw: add winsw
add urlShortener.xml
update bats
add winsw.exe
2022-02-21 20:46:23 +03:00
Sergey Kirichenko
6e20d619d1 Mod socket proxy conf 2022-02-14 18:41:15 +03:00
5c9336d50b
Bugfix/update OneClickInstall (#505)
* Add document server image configuration

* Modify docker document server run config (#476)

* Changing the files installation

* Add an update to Docker-1click

* Minor changes

* Fix mysql installation

* Change the kafka installation

* Update kafka version

* Download sql scripts
2022-02-10 10:37:09 +03:00
f4d6cdde59
Bugfix/change a spec file (#514)
* Add a necessary sources

* Visual code changes

* Update appserver.spec
2022-02-09 10:25:10 +03:00
Sergey Kirichenko
340fac7626 Add install to image sudo 2022-02-08 12:00:23 +03:00
Sergey Kirichenko
493a189bf3 Add install to image curl, vim 2022-02-08 11:23:50 +03:00
Sergey Kirichenko
6307f558ad Add node install to images 2022-02-08 10:04:53 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00