Commit Graph

311 Commits

Author SHA1 Message Date
Sergey Kirichenko
dd21a1b290
Add github action (#804)
* Modified Dockerfile.app

* Add github workflow

* Modify GIT_BRANCH

* Modify Dockerfile.app, change github repo

* Add prefix for name services

* Add login image build

* Change nginx config loclahost to 127.0.0.1

* Del static login files from proxy image

* Modify environmet for yml files

* Fix build hooks

* Add env STATUS for build hooks

* For testinig dockerhub build

* Fix

* Branch for action feature/github-action-build-docker

* Modify hooks

* Modify hooks, develop branch for action

* Add service-login to proxy

* Action test amd64

* Action test amd64

* Git  action  build only amd64

* Github action from develop
2022-09-13 10:54:45 +03:00
23436472ed
Add new services and rebranding in packages\scripts (#786)
* Add new services, delete old services and kafka

* Corrections to appserver-configuration script

* Download the get-php script depending on the version of py

* Add doceditor and migration-runner services

* Docspace rebranding

* Rename a spec file

* Update build.sh

* Fixes in proxy package

* Rename script

* Fix launch of node js services

* Edit connection strings in migration-runner service

* Fix minor errors

* Update docspace-configuration.sh

* Update docspace-configuration.sh

* Add configuration of redis and rabbitmq services, as well as minor bug fixes

* Correct redis configuration

* Rebrand and add new services for deb package

* Fix build directory for deb package

* Revert "Fix build directory for deb package"

This reverts commit 9c711fc735c57e154e6b818988384d4b7e60c338.

* Add postinst for radicale package

* Fix python dependency

* Fix errors in control file

* Fix errors when building a deb package

* Update rules

* Rebranding of installation scripts

* Update build.spec

* Add migration for Docs Database

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-09-01 21:10:34 +03:00
d165a09a9c install.bat requires administrative privileges 2022-08-22 18:52:13 +03:00
2e06c8fd58 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
#	build/install/win/DocSpace.aip
2022-08-10 09:57:03 +03:00
Sergey Kirichenko
09be9c3907
Modify rabbit, redis docker running (#754)
* Modify rabbit, redis run

* Modify
STORAGE_ROOT

* Syntax modify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-08-09 15:57:34 +03:00
Eugene Kozyrev
6b1dc19992
Feature/Rename AppServer to DocSpace in windiows installation (#752)
* Rename AppServer to DocSpace

* Rename project
2022-08-08 11:01:15 +03:00
Eugene Kozyrev
f1e2a0b145
Edit StartMigrationRunner execution sequence (#753) 2022-08-08 10:48:46 +03:00
Eugene Kozyrev
de61cedfd1
Feature/Refactor windows installation (#749)
* Refactor services start

* Change executable

* Add substitutions

* Add substitutions

* Add redis erlang rabbit

* Update AppServer.aip

* Add custom actions

* Add dialogs

* Update AppServer.aip

* Update AppServer.aip

* Add docspace_upgrade1.sql execution

* Add sql scripts

Delete ApiSystem service
Delete StorageEncryption service
Delete StorageMigration service

* Update AppServer.aip

* Update AppServer.aip

* Update AppServer.aip

* Refactor install project

* Add new exe files

* Add sql execution

* Upgrade MySQL version to 8.0.29

* Add new services

* Delete Thumbnails prop

* Edit sql scripts

* Delete sql connection

* Add migration runner

* Edit StartMigrationRunner

* Edit typo

* Edit fail condition

* Update publish

* Downgrade MySQL version to 8.0.21

* Update build-download-prereq.ps1

* Change dialogs banner

* Add debug migration run

* Update nginx.conf

* Add shortcuts

* Edit StartMigrationRunner

* Add PRODUCT_NAME

* Delete AppServer.back.aip

* Update AppServer.aip

* Update nginx.conf

* Delete shortcuts

* Add norestart flag

* Test

* Revert "Add norestart flag"

This reverts commit 535d37841caab542302ac2255c1fd3993a21b782.

* Update AppServer.aip

* Update AppServer.aip

* Add redistributable libs download

* Change packages download via NuGet

* Add RabbitMQ.Client package download

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-08-04 08:27:22 +03:00
sk81.biz@gmail.com
7781a3fa5c Modify node version 2022-08-02 16:21:33 +03:00
sk81.biz@gmail.com
77820a5cf9 Modify docker client build 2022-08-02 12:21:05 +03:00
sk81.biz@gmail.com
9a7a426680 Modify editor image build 2022-07-29 11:51:38 +03:00
Sergey Kirichenko
a7ebccb5cb
Add doceditor docker service (#742)
* Add docker doceditor service

* fix

* Cosmetic modify

* Cosmetic modify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-28 15:33:03 +03:00
Sergey Kirichenko
2a1883977c
Add feature for migration db in docker (#740)
* Add migration runner build image

* Add path for migration.runner build

* Modifiex build path migration.runner

* Fix migration-runner.yml

* Modify reference format for dockerhub

* Fix

* Check build reference format

* Fix build

* Modify migration runner  build path

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-27 16:48:00 +03:00
Sergey Kirichenko
5dfc123374
Add docker services build (#739)
* Add docker services

* fix build, fix notify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2022-07-26 12:26:42 +03:00
sk81.biz@gmail.com
f56ac822b2 Cosmetic modify 2022-07-21 11:47:05 +03:00
sk81.biz@gmail.com
4e82c38cb5 Cosmetic modify 2022-07-05 18:09:51 +03:00
sk81.biz@gmail.com
5abd420172 Cosmetic modify 2022-07-05 17:36:58 +03:00
sk81.biz@gmail.com
5919ef43ed Del docker-entrypoint-node py, sh; docker-entrypoint-dotnet.sh 2022-07-05 17:30:51 +03:00
sk81.biz@gmail.com
80e43d8848 Build docker services with python docker-entrypoint 2022-07-05 17:07:58 +03:00
Sergey Kirichenko
732291b23e Del peckages microf repo from Dockerfile.app 2022-06-28 09:41:07 +03:00
Sergey Kirichenko
6c75ff8970 Add repo for packages 2022-06-27 11:32:19 +03:00
Sergey Kirichenko
6af5b6ad0c Fix hooks build(add build args SDK,RUN)
~
2022-06-24 21:55:28 +03:00
Sergey Kirichenko
1e814b863b fix mysql settings 2022-06-24 17:47:36 +03:00
Sergey Kirichenko
cef80ac647 Fix people service run 2022-06-23 12:06:57 +03:00
Sergey Kirichenko
06beb4d7fd Add parametrs for start dotnet services 2022-06-22 12:02:33 +03:00
e2cee2c2fc Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
945e9d8efe moved from ddf515b8 2022-06-17 18:46:16 +03:00
Sergey Kirichenko
23da37d729 Fix 2022-06-17 11:35:02 +03:00
Sergey Kirichenko
bbf71a55eb Fix config copy 2022-06-17 09:31:24 +03:00
Sergey Kirichenko
753cc8adab Fix node image build 2022-06-15 12:20:18 +03:00
Sergey Kirichenko
0cd8c7dd3d Fix run node 2022-06-15 11:23:52 +03:00
Sergey Kirichenko
060251afb4 Add kafka run config 2022-06-15 10:23:52 +03:00
Sergey Kirichenko
06a91659bc Fix build 2022-06-14 11:27:15 +03:00
Sergey Kirichenko
fc7fb4edcc Modify config files copying 2022-06-14 10:06:44 +03:00
Sergey Kirichenko
9f0e613d23 Mod pip to pip3 install 2022-06-10 13:23:54 +03:00
7b9e916396
Bugfix/packages correction (#687)
* Add database migration

* Delete projects, crm, calendar and mail services

* Delete projects, crm, calendar and mail services

* Add package version dependency

* Update a version of dotnet-sdk package

* Minor improvements in scripts

* Correction of 'invalid operation exception' error

* Fix mysql connection error

* Update nodejs version

* Fix appserver-backup startup error

* Change kafka user

* Fix running services after installation

* Add kafka directory

* Remove unused dependency

* Add onlyoffice group creation

* Revert "Remove unused dependency"

This reverts commit 4bc0d2fad409f472e33b2588ded68942fb794241.

* Add php update during installation

* Сode optimization
2022-06-10 13:11:33 +03:00
Sergey Kirichenko
543c412d84 Modify node images build 2022-06-10 12:40:55 +03:00
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
Sergey Kirichenko
d595c19eae
Fix socket.tets.json config path (#634) 2022-04-29 10:21:18 +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
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
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
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
7f70d0be04 Merge branch 'feature/backend-refactor' into feature/winsw 2022-02-24 14:50:18 +03:00
ac0e314f60 winsw: refactoring
update bats
relocate xml and exe
2022-02-22 15:45:21 +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
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
eca872cdd8
Add hardware check in deb and rpm OneClickInstall (#479)
* Add hardware check in deb and rpm OneClickInstall

* Modify docker document server run config (#476)

* Revert "Modify docker document server run config (#476)"

This reverts commit 9ed7f71e71ad431386717d37968b97ec2117add8.
2021-12-10 16:26:34 +03:00
805718a71b Update kafka version in OneClickInstall 2021-12-10 14:30:01 +03:00
Sergey Kirichenko
8d1f9da11c
Modify docker document server run config (#476)
* Fix config

* Modify docker ds config

* Modify docker document server run
2021-12-06 15:21:06 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
Sergey Kirichenko
2d0bdb0646
Add an additional tag for docker images in push hook script (#462)
* Add tag for hook push sript

* Modify pash hook

* Modify pash hook

* Modify pash hook

* Modify pash hook

* Modify pash hook
2021-11-19 14:19:30 +03:00
738cacbf16
Change location of dotnet file 2021-11-11 15:37:59 +03:00
Sergey Kirichenko
8e9725d820 Merge branch 'hotfix/v1.0.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.0.1 2021-11-02 14:39:29 +03:00
Sergey Kirichenko
f3746a43ab Modify parameters 2021-11-02 14:38:11 +03:00
Sergey Kirichenko
84b76d9f25
Add disable_elastic=true to ASC.Files.Service run config (#446) 2021-11-01 19:39:20 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
957aa8bd81 fixed started services 2021-10-26 20:09:19 +03:00
3ce15a9329 refactoring build scripts 2021-10-26 16:14:34 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
73403bcbff
Bugfix/modify docker oneclick (#385)
* Modify docker oneclick

* Add a variable with a branch selection

* Minor correction
2021-10-11 12:08:29 +03:00
Sergey Kirichenko
5d1bfbefa4
Modify docker images build (#380)
* Modify images build config

* Cosmetic modify

* Modify git clone ind Dockerfile
2021-10-06 16:43:18 +03:00
Sergey Kirichenko
39357575fe Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0 2021-10-05 18:41:35 +03:00
Sergey Kirichenko
8f89247357 Fix script 2021-10-05 18:40:49 +03:00
Sergey Kirichenko
74902888b7 Fix docker image build 2021-10-05 16:52:26 +03:00
Sergey Kirichenko
0a8f6c9e48 Modify arguments for build scripts in Dockerfile-app 2021-10-05 11:34:44 +03:00
Sergey Kirichenko
68f58468cc Add debug infor to build srcipt 2021-10-05 11:28:06 +03:00
43a8959f74
Minor bug fixes (#361) 2021-09-30 17:41:11 +03:00
Sergey Kirichenko
dbc174e955
Add support to deb package (#266) 2021-09-30 15:05:43 +03:00
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
4a0c6a94c6 replace nssm with sc 2021-09-22 19:51:37 +03:00
Sergey Kirichenko
9221136e50
Modify frontend build feature (#341)
* Modify frontend build

* Modify frontend build

* Modify build hooks
2021-09-21 10:53:05 +03:00
Sergey Kirichenko
f624b20fb4
Add service ASC.SsoAuth (#313)
* Add build service ASC.SsoAuth

* Fix build Dockerfile-app and build-frontend.sh

* Fix build path for ASC.SsoAuth.Svc
2021-08-03 12:29:21 +03:00
84ea95559f
Bugfix/Change the systemd startup type (#302)
* Change the systemd startup type

* Delete the unused systemd parameter

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-07-29 16:23:45 +03:00
Sergey Kirichenko
c85a1185ec
Modify build backend scripts (#310) 2021-07-27 12:03:19 +03:00
Sergey Kirichenko
7a06b0c2e9
Modify docker build config files for sw.js (#308) 2021-07-22 19:27:30 +03:00
653066af0c Merge branch 'develop' into release/1.0.0
# Conflicts:
#	config/nginx/onlyoffice.conf
2021-07-20 18:21:00 +03:00
Sergey Kirichenko
eacf6e663c
Add modification of number in appsettings (#304)
* Modify number in appsettigs

* Cosmetic changes

* Cosmetic changes

* Modify arg in Docker-app

* Add build args in hooks build

* Add arg varibles to hooks build
2021-07-16 20:14:37 +03:00
8d287249af
Bugfix/rpm errors (#295)
* Fix the elasticsearch configuration

* Add copying of the start files

* License correction

* Fix file copying

* Add a warning about an unsupported version of the distribution

* Correction of folder names

* Correction of directory name

* Fix configuration errors and add a quiet mode

* Remove a quiet mode

* Release ports for launching services

* Add topics to launch socket.io

* Fix folder name

* Fix the output of messages about the creation of topics

* Remove unnecessary lines

* Delete an unnecessary line
2021-07-13 18:03:48 +03:00
Sergey Kirichenko
7af9bb08c9
Fix elasticsearch configure (#285) 2021-06-18 14:30:11 +03:00
Sergey Kirichenko
a91ea81e89
Modify elasticsearch configuration (#281)
* Modify elasticsearch config

* Modify version ELK

* Cosmetic modify
2021-06-17 12:49:39 +03:00
Sergey Kirichenko
7dc8889e2f
Fix building image ASC.Socket.IO.Svc (#276) 2021-06-10 18:18:07 +03:00
Sergey Kirichenko
82b3109fbc
Fix building ASC.Files image (#275) 2021-06-10 15:42:04 +03:00
a9cb51056b
Add support docker installation (#271)
* Fix removing old packages in rpm

* Add script downloads from github

* Add oneclickinstall by using docker

* Add a common script to select the installation

* Correction file name

* Add a reconfigure

* Edit download files

* Add a parameter for silent download

* Change the external port configuration

* Add the dotnet_env variable

* Add password generation

* Add invalid character filtering

* Change the copyright

* Change the copyright

* Add the local scripts parameter

* Minor fixes

* Copyright correction
2021-06-09 18:48:42 +03:00
4e5bd47c26
Feature/rpm update (#229)
* Add a build and install new services

* Change the packaging for the new build script

* Correct the configuration

* Add a bug fix with a mysql password containing ';'

* Fix services crash error

* Fix incorrect value addition in mysql

* Fix a rabbitmq error on CentOS 8

* Fix creating an invalid mysql password

* Fix non-existent tables Tenants

* Add an update to 1click

* Code correction

* Add two new services

* Add the buildpath variable

* Code Optimization

* Renaming services and creating a variable for the app name

* Revert "Merge branch 'feature/rpm-update' of https://github.com/ONLYOFFICE/AppServer into feature/rpm-update"

This reverts commit 19c1eae6f6e3f22f4cbc0e3276fa892b0d9fa97a, reversing
changes made to fb36a996366291486e3b9f5a6f46398916ef8a6c.

* Code Optimization

* Code optimization

* Code optimization and creating a variables
2021-05-20 17:39:38 +03:00
Vyacheslav Semin
3c2cc92001
Make the necessary edits to install in k8s (#255)
* Make the necessary edits to install in k8s

* Add image build for waiting for appserver to start

* Edit the env file
2021-05-18 12:36:21 +03:00
SuhorukovAnton
3435b49b72 replace_nuget: delete configfile 2021-05-05 14:48:34 +03:00
Sergey Kirichenko
1e05b2a216
Del files in base image (#239)
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-29 15:27:50 +03:00
Sergey Kirichenko
baafc5f175
Add calendar and mail service in docker (#234)
* Add 2 services building feature

* Add 2 services for runnig

* Del in .env status latest

* Add to notify.yml 2 volumes

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-26 19:08:48 +03:00
Sergey Kirichenko
69fb52026f
Add feature to run single notify service (#223)
* Modify building docker images

* Add argument to build script

* Modify build images

* Add feature build from oficial dotnet image

* Add feature build from oficial dotnet image

* Rename notify yml file

* Fix conflict

* Fix conflict

* Fix conflict

* Del RID aprument in build scripts

* Cosmetic modify
2021-04-14 15:45:16 +03:00
be66f17d92
Fix version mismach 2021-04-09 16:29:45 +03:00
Sergey Kirichenko
3ba4cf8807
Add build app on docker without copy dll (#213)
* Modify files for running new services

* Modify Dockerfile-app

* Modify

* Fix Dockerfile-app

* Fix start servives studio-notify, urlshortener

* Fix, modify services with sdk 5

* Build app without copy dll

* Modify Dockerfile

* Cosmetic changes

* Add build srcipts to Dockerfile

* Delete test sh scripts

* Del status 4testing

* Fix docker hub build

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-04-07 12:15:27 +03:00
Sergey Kirichenko
ad3eed3552
Add scripts for building services (#212)
* Add build and publish srcipts for services

* Add script for buildint frontend

* Fix publish-backend.sh

* Modify publish script for building

* Cosmetic modify publish backend script
2021-04-06 14:28:12 +03:00
c1fa203780
Feature/rpm support (#192)
* Create specfiles and systemd scripts

* Add fix

* Add systemd packaging

* add fix

* Add fix

* Add configuracion and fixes

* Update app-conf.sh and change cfg dir

* Add ability to start nodejs

* Update config

* Change owner of folders

* Delete temporary files

* Fix chmod config

* Fix configure docs

* Сode optimization

* Add configuration elasticsearch

* Rename directory

* Fix work with the name of branches that include '/'

* Fix work with the name of branches that include '/'

* Revert "Fix work with the name of branches that include '/'"

This reverts commit c0970cd84657dac503843720b0cdbce0130a329c.

* Revert "Fix work with the name of branches that include '/'"

This reverts commit 6ea3718df8950dd6ec87642195822a6ee433c40e.

* Add fix

* Add fix

* Add ability to change the release and version

* Fix docs configuration

* Add kafka configuration

* Add environment variables

* Add fix

* Add old rpms removal and buildroot removal

* Add OneClickInstall

* Correct the typo

* Move systemd from rpm to common

* Add a user-defined configuration option .json

* Add minor fix

* Add a machinekey generation

* Add a typo fix

* Change nodejs version

* Change the location of some folders

* Fix minor bugs

* Fix minor bugs

* Rename service directories

* Fix kafka privileges

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
2021-03-19 15:50:47 +03:00
Sergey Kirichenko
525654fdef Correct spelling 2021-01-18 15:09:43 +03:00
Sergey Kirichenko
f11758af1c Cosmetic modify Docker-app 2020-12-30 10:51:40 +03:00
Steklov Sergei
faa8c66d09
Add source branch variable to docker hub build environment (#163) 2020-12-29 17:08:38 +03:00
12881aa2c6
Use master as default branch for build (#160)
* Use master as default branch for build

* Update build

* Update push
2020-12-28 20:13:33 +03:00
Sergey Kirichenko
bb06f4aa53
Add docker multiple Appserver services (#136) 2020-12-25 14:27:26 +03:00
3ca0990715 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/EF/Model/FilesConverts.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2020-10-08 19:01:09 +03:00
37d36ce86c Supervisor: fix backup 2020-10-07 16:10:20 +03:00
955d1c4db6 Merge branch 'master' into feature/files 2020-08-27 12:07:08 +03:00
be32dfb86a Docker: fix publish 2020-08-27 12:06:21 +03:00
5633d2467b Merge branch 'master' into feature/files 2020-08-27 10:42:47 +03:00
cff1a01f70 Docker: fix build 2020-08-20 19:04:13 +03:00
585d98f8f4 Files: core. replace 2020-07-28 15:45:14 +03:00
156f7cb534 Docker: fix files. 2020-07-28 14:21:41 +03:00
8d0d5fd908 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
#	web/ASC.Web.Components/package.json
2020-07-16 14:41:32 +03:00
281b7a4406 Docker: fix 2020-07-16 14:27:30 +03:00
45678da8e5 Merge branch 'master' into feature/files 2020-07-10 14:58:37 +03:00
74b9676819 Docker: added thumbnail, backup, notify 2020-07-07 19:26:55 +03:00
8f9e294d21 docker: bug fix 2020-06-26 12:28:38 +03:00
b3aaa823f5 docker: update sql dump 2020-06-26 11:46:51 +03:00
8afdad8eb4 docker: select branch 2020-06-24 16:51:29 +00:00
be09fc0510 docker: change config/supervisor/supervisord.conf 2020-06-23 19:40:01 +00:00
453c812476 docker update 2020-06-23 18:10:13 +00:00
11cf2a954f docker: mysql sample data 2020-06-23 19:55:14 +03:00
62e179fae0 update dockerfile 2020-06-23 15:31:48 +00:00
ea3147af98
Update Dockerfile 2019-12-16 16:06:06 +03:00
fdfaae8abe Docker: .net core up to 3.1 2019-12-09 15:19:18 +03:00
0b1feec7af Docker: added ASC.Web.Common 2019-12-05 12:14:03 +03:00
740942d938 docker: rename repo 2019-11-15 10:45:27 +00:00
f07f71cf59 docker: add libgdiplus package 2019-11-14 14:29:17 +00:00
1f246aac8b docker: add libgdiplus package 2019-11-14 13:32:24 +00:00
f1f313a1bf docker: bug fix 2019-10-11 15:34:49 +00:00
54f3cc778d docker: init commit 2019-10-08 15:00:41 +00:00
57866b8ce3 win: init commit 2019-09-10 18:20:33 +03:00
01e2b38e5c snap: delete obsolete files 2019-09-10 16:45:51 +03:00
3341b343d1 snap package: init 2019-09-04 15:33:02 +00:00
355278cfd1 Requesting administrative privileges for install/uninstall/start/stop 2019-07-11 16:02:33 +03:00
1af2396d38 Start/stop, install/uninstall services via nssm 2019-07-11 13:24:10 +03:00