Commit Graph

570 Commits

Author SHA1 Message Date
9647236ea8 Update Dockerfile.dev
Fix docker git clone layer caching
2022-10-28 20:30:20 +03:00
641d63b0a5 Update stop.backend.docker.sh 2022-10-28 20:29:28 +03:00
Sergey Kirichenko
0b8360a0d7
Add docker image api_system (#954) 2022-10-27 13:39:21 +03:00
fe5385053c rebbitmq: split default queue on separate queue 2022-10-26 17:21:37 +03:00
24f31b870c
Fix the apt-key deprecation error (#950) 2022-10-26 11:45:03 +03:00
440943f81b Update run.translations.tests.sh 2022-10-24 13:31:11 +03:00
c1a61e0dbc Create run.translations.tests.sh 2022-10-21 17:19:52 +03:00
84d98545f3 Update dev docker scripts 2022-10-20 15:01:25 +03:00
f01376cc56 Merge branch 'develop' into feature/remove-waste 2022-10-20 11:24:20 +03:00
56ef525cde Removed --depth 1 on git clone 2022-10-19 18:41:24 +03:00
2767e172c6 Update core_base_domain 2022-10-19 18:40:54 +03:00
afc9d1ce17 Merge branch 'develop' into feature/remove-waste 2022-10-19 14:18:52 +03:00
16bb42d0af fix ASC.Data.Storage.Encryption 2022-10-19 13:12:33 +03:00
521d69be08 Added set APP_CORE_BASE_DOMAIN and ENV_EXTENSION 2022-10-18 12:33:59 +03:00
e40e707640 Update docker-entrypoint.py
Fix set APP_CORE_BASE_DOMAIN equals ""
2022-10-18 12:32:13 +03:00
33ca5a8f78 Update db.yml
Map to local port 33060 for connection to host's clients
2022-10-18 10:49:49 +03:00
502aac91b1 ApiSystem: log, service 2022-10-17 18:24:50 +03:00
ed22136269 Merge branch 'develop' into feature/remove-waste 2022-10-17 14:31:57 +03:00
e0f1c0529d Added stop, start, restart sh-files 2022-10-15 07:34:40 +03:00
1d0dddf196 Added mapping appsettings.dev.json from substitutions 2022-10-15 07:32:52 +03:00
fb8190b465 Added --no_ds param 2022-10-13 17:52:46 +03:00
0ee788fb00 Fix run migration-runner 2022-10-13 16:18:14 +03:00
b6c363e103 Added ROOT_DIR 2022-10-13 16:02:25 +03:00
82f0731d7d Fix open files in DocEditor + refactoring 2022-10-13 15:26:37 +03:00
6cb1d7ac21 Added new variables setup + refactoring 2022-10-13 14:28:26 +03:00
6b12fe9e1e Added public volume 2022-10-12 15:25:56 +03:00
5cda2d314f Added nginx routing to Host client apps 2022-10-12 14:33:06 +03:00
8b52d93fd3 Init backend and environment build and run in docker 2022-10-11 16:01:03 +03:00
Sergey Kirichenko
8d528450dc
Modify root path (#904) 2022-10-11 12:44:22 +03:00
c16ef82df3 Update runMigrations.sh
Added execution flag (chmod +x)
2022-10-06 12:14:12 +03:00
0869ce4bfb Create socket.sh 2022-10-05 14:44:41 +03:00
ec85cb896a Update build.sh 2022-10-05 14:43:43 +03:00
6682ca850e fix 2022-10-05 14:04:24 +03:00
f726879370 Build: Added MacOS build and run files 2022-10-03 16:26:34 +03:00
Eugene Kozyrev
51ba7c8628
Feature/Update Windows installation (#857)
* Add DocEditor service

Update windows installation project on develop

* Add ASC.Login service

* Delete onlyoffice-login.conf

* Add json configs substitutions

* Edit StartMigrationRunner custom action

* Set service run as NT AUTHORITY\LocalService

* Move config file substitutions to project

* Remove condition to SetMACHINEKEY

* Revert "Set service run as NT AUTHORITY\LocalService"

This reverts commit 3e9c578a652e38f346f7e7fd52eca4ab72dcf537.

* Fix nginx conf substitution

* Add Local Service permitions

* Add folders permitions

Move node.js service logs

* Fix

* Edit logpath
2022-09-28 17:02:59 +03:00
4001798d2a
Bugfix/Add new service and packages correction (#839)
* Add a login service

* Fix a typo

* Fix minor bugs

* Update build.sh

* Add login service to deb package

* Fix minor bugs

* Fix nginx configuration

* Fix minor bugs

* Add additional variables and replace the kafka service with redis\rabbitmq
2022-09-26 13:03:36 +03:00
6563d4b633 nlog: refactoring service name 2022-09-16 16:41:51 +03:00
1f07a7ddad Merge branch 'develop' into feature/remove-waste 2022-09-13 17:14:49 +03:00
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
25ae19d601 Merge branch 'develop' into feature/remove-waste 2022-09-09 11:52:13 +03:00
26df50c457 remove unused projects 2022-09-08 17:05:35 +03:00
b811d2bb14 Web: Removed useless for static build 2022-09-02 11:31:35 +03:00
8ce30932a3
Merge branch 'develop' into feature/login-ssr 2022-09-02 10:10:26 +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
14de652fa7 Build: Added new service Login SSR 2022-09-01 12:21:55 +03:00
TimofeyBoyko
0748afe854 Plugins: add logs, config and change service start 2022-08-26 12:51:43 +03:00
TimofeyBoyko
67cd56c62f Plugins: fix build 2022-08-24 19:13:48 +03:00
TimofeyBoyko
4378905bbc Build: Scripts: update plugins.bat 2022-08-24 12:35:23 +03:00
TimofeyBoyko
7042dca053 Merge branch 'develop' into feature/system-plugin-v2 2022-08-23 14:38:45 +03:00
TimofeyBoyko
c0259d1767 Web: add new service WebPlugins 2022-08-23 14:23:11 +03:00
7c03525732 build: check errors 2022-08-22 19:46:49 +03:00
d165a09a9c install.bat requires administrative privileges 2022-08-22 18:52:13 +03:00
b5f4e30104 Merge branch 'develop' into feature/webhook-fix 2022-08-22 14:27:02 +03:00
1ea604ec36 fixed jenkinsfile 2022-08-22 14:26:19 +03:00
89157000e5 fixed createMigrations.bat 2022-08-16 17:46:29 +03:00
fa1258618a fixed warnings 2022-08-12 17:49:34 +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
bdf4db49da
Merge branch 'develop' into feature/docker-build-modify-frontend 2022-08-02 18:58:38 +03:00
sk81.biz@gmail.com
7781a3fa5c Modify node version 2022-08-02 16:21:33 +03:00
650767c7ec fixed build scripts 2022-08-02 15:24:19 +03:00
sk81.biz@gmail.com
77820a5cf9 Modify docker client build 2022-08-02 12:21:05 +03:00
c39b845da9 Build: Removed old fix path commands 2022-08-01 16:56:45 +03:00
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
d093c97b97 Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes) 2022-08-01 15:37:33 +03:00
995d07deae Web: Upgrade yarn to v3.2.2 2022-07-29 18:20:57 +03:00
sk81.biz@gmail.com
9a7a426680 Modify editor image build 2022-07-29 11:51:38 +03:00
Artem Tarasov
3ff0ae9d44 Merge branch 'develop' into bugfix/doceditor-build-fix 2022-07-28 17:40:54 +03:00
Artem Tarasov
5496cdbe05 Web: Doceditor/build: changed deploy path for editor 2022-07-28 17:39:25 +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
3d22992b7d Migrations: rename 2022-07-26 14:52:53 +03:00
e4df3b2371 fix 2022-07-26 13:39:16 +03:00
6e0aa3a6f9 fix 2022-07-26 13:21:21 +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
e8bcfce41a removed sql files
added runMigrations.bat
2022-07-25 19:03:37 +03:00
9a8177663b added new service 2022-07-22 13:15:27 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
b4cd5ffa0c
Merge branch 'develop' into feature/appserver-develop-docker-build 2022-07-21 15:05:34 +03:00
sk81.biz@gmail.com
f56ac822b2 Cosmetic modify 2022-07-21 11:47:05 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-10 11:23:44 +03:00
7af929fee8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +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
542c29aa8a Web: Translations: Added minimization for 'public/locales' directory 2022-07-03 15:55:53 +03:00
Artem Tarasov
2ef94f75da Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-01 23:41:10 +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