Commit Graph

832 Commits

Author SHA1 Message Date
70b9ac1380 Fix a bug with uploading documents in packages 2023-03-22 02:37:14 +03:00
fd81590b0c Fix packages supply configuration 2023-03-21 22:49:46 +03:00
4601ba5964 Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-21 15:54:57 +03:00
3d70981509 Build: Fixed elasticsearch property for dev compose file 2023-03-21 15:54:48 +03:00
sk81.biz@gmail.com
9f3c870ac4 Fix elastic config 2023-03-21 15:13:23 +03:00
2288705998 Build: Fixed elasticsearch image for dev compose file 2023-03-21 13:01:14 +03:00
03c6dee4a4 unix: dev docker: bump MySql to 8.0.32 on arm 2023-03-21 12:32:42 +04:00
Sergey Kirichenko
ea54237ca3
Add possibility configure elc at run docker-entrypoint (#1294)
* Fix set elastic env at runnuing docker-entrypoint

* Configure elastic during running service

* Cosmetic change
2023-03-21 13:09:19 +05:00
944d24068b Fix event bus config for services in packages 2023-03-17 18:36:22 +03:00
4e79dbab58 Add event bus config for services in packages 2023-03-17 14:50:45 +03:00
48ae6d8bcc Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-03-17 15:24:31 +04:00
7c13498118 Add ffmpeg to files-services docker dev image 2023-03-17 15:24:22 +04:00
e1d81939bf Remove log-error file in docker mysql 2023-03-17 14:21:36 +03:00
a2db46942d Add the output of commands to the terminal and interrupt the script in case of an error 2023-03-17 14:15:50 +03:00
0701f044a7 Fix the installation of dotnet-sdk-7.0 for ubuntu 22.04\debian 9 2023-03-17 12:07:41 +03:00
d392f3165c Update the GPG key installation method 2023-03-17 12:06:23 +03:00
cb452f5e2a Generated JWT secret is too small for HMAC SHA256 2023-03-17 12:05:02 +03:00
25e72a1f0a Fix database creation without onlyoffice owner 2023-03-17 12:04:40 +03:00
Sergey Kirichenko
1ff7d66570
Add ffmpeg to files-services docker image (#1309)
* Add ffmpeg to file-services

* Add ffmpeg to file-services

* Add ffmpeg to file-services

* Add rm libs in image
2023-03-16 19:06:43 +05:00
sk81.biz@gmail.com
cc7bd49acf Modify docker image mysql to version 8.0.32 2023-03-16 12:28:47 +03:00
nasrullonurullaev
2fda5bf176
Add WebHealthChecksUI service package (#1301)
* Add HealthChecks service package

* Fix issue with installing WebHealthChecksUI service
2023-03-15 11:55:45 +05:00
nasrullonurullaev
ce0feb497e
Update dotnet runtime version to 7.0.3 (#1296) 2023-03-10 14:11:43 +05:00
1107209611 Fix dev docker build 2023-03-09 16:08:08 +04:00
Sergey Kirichenko
71bb2f70ae
Add helthchecks ui web page (#1293)
* Add feature to get page with healthchechks ui

* Add healthchecks config to nginx

* Fix config nginx
2023-03-09 14:05:49 +05:00
34b3fe715c Fix frontend tests running 2023-03-09 12:12:31 +04:00
Sergey Kirichenko
9698985be0
Add event bus config for services in docker-entrypoint (#1248)
* Add eventBus to the docker-entrypoint

* Fix error - list index out of range

* Fix docker-entrypoint syntax
2023-02-28 18:18:07 +05:00
c54f55ece5 Turn on JWT 2023-02-27 18:52:45 +04:00
sk81.biz@gmail.com
aa98fec3ec Modify docker DATABASE to docspace for default 2023-02-22 14:36:39 +03:00
Sergey Kirichenko
378993455a
Modify docker-entrypoint.py. Add Redis config User and Password features running (#1191) 2023-02-09 17:42:25 +05:00
Sergey Kirichenko
87e7e563c9
Modify docker-entrypoint rabbitma config (#1171) 2023-02-09 17:41:09 +05:00
2801e07035
Bugfix/rpmlint-error (#1160)
* Correction of the missing package expect error

* Correction of summary-ended-with-dot error

* Correction of description-line-too-long error and change to the current text

* Correction of non-executable-script error and dangerous-command-in-%post error

* Correction of unstripped-binary-or-object error

* Correction of non-standard-executable-perm error

* Fix creation of libraries to support arm

* Fix packaging of unnecessary configuration files

* Correction of setup-not-quiet error

* Correction of mixed-use-of-spaces-and-tabs error

* Correction of no-cleaning-of-buildroot error

* Correction of no-buildroot-tag error

* Correction of no-changelogname-tag error

* Temporary сorrection of summary-not-capitalized error

* Temporary correction of no-description-tag error

* Remove unused code

* Disable packaging of debug information

* Remove package_sysname

* Add documentation packaging

* Add rpmlintrc packaging

* Fix documentation packaging

* Correction of the hardcoded-packager-tag error

* Change the substitution of version and release
2023-02-01 13:09:31 +05:00
66ed2b6372
Bugfix/lintian error (#1158)
* Correction of systemd-service-file-references-to-obsolete-target error

* Correction of the changelog format

* Correction of package-uses-deprecated-debhelper-compat-version

* Correction of maintainer-script-needs-depends-on-adduser

* Correction of missing-debconf-dependency

* Correction of extended-description-is-probably-too-short

* Correction of various license format errors

* Correction of maintainer-script-lacks-home-in-adduser error

* Correction of duplicate-updaterc.d-calls-in-postinst error

* Correction of init.d-script-not-included-in-package error

* Correction of the error of missing the onlyoffice-login.conf file

* Correction of binary-from-other-architecture error

* Correction of missing-debian-source-format error

* Temporarily correct descriptions

* Correction of debhelper-but-no-misc-depends error

* Correct of missing-dependency-on-line error

* Correct of unstripped-binary-or-object error

* Correct of maintainer-script-lacks-debhelper-token error

* Change templates description

* Correction of untranslatable-debconf-templates error

* Fix configuration according to po-debconf recommendations

* Fix configuration according to po-debconf recommendations

* Fix condition for detecting existence of file

* Correct of script-with-language-extension error

* Correct of script-with-language-extension error

* Remove linux-arm runtimes packaging

* Add lintian-overrides

* Fix lintian-overrides creation condition

* Fix lintian-overrides creation condition

* Add overrides for the main package

* Add ignoring untranslatable-debconf-templates errors

* Errors correction: package-contains-eslint-config-file, package-contains-npm-ignore-file, package-contains-vcs-control-file

* Correction of node_modules error output

* Fix backup-file-in-package and macos-ds-store-file-in-package errors

* Add a override of the unusual-interpreter error

* Fix removing files that cause errors
2023-02-01 13:06:03 +05:00
232f32f5f1
Modify dotnet-sdk version to 7.0 in a package supply (#1150) 2023-02-01 12:57:23 +05:00
1a5d940734
Feature/healthcheck service packaging (#1161)
* Add healthcheck service to packages

* Fix typo in docker supply

* Fix packaging of healthcheck service
2023-02-01 12:56:41 +05:00
9f71bde64d
Feature/logrotate packages (#1159)
* Add logrotate for packages supply

* Fix end of line error

* Change the name of logrotate file
2023-02-01 12:55:10 +05:00
sk81.biz@gmail.com
73a8433126 Add feature for modify env for radis, rabbit 2023-01-25 10:38:50 +03:00
51a064926e Modify docker dotnet image v6.0 to docker dotnet image v7.0 for development 2023-01-20 10:34:11 +03:00
sk81.biz@gmail.com
eec570f14a Modify docker dotnet image v6.0 to docker dotnet image v7.0 2023-01-19 21:55:21 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
Sergey Kirichenko
646f2e702e
Add Healthcheck docker image (#1143)
* Add services helth-checks

* Fix entrypoint

* Cosmetic modify

* Fix docker-healthchecks-entrypoint
2023-01-17 11:09:20 +03:00
16e051961f Fix the installation of the rabbitmq repository 2022-12-28 17:12:59 +03:00
86e8fa8beb Update 1-Click from CS 2022-12-22 16:13:49 +03:00
Akmal Isomadinov
532f94ba0c Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
# Conflicts:
#	packages/client/src/helpers/confirmRoute.js
2022-12-22 15:47:55 +05:00
Akmal Isomadinov
f6c0ae47f0 Build Fixed run.translations.tests.bat 2022-12-22 15:03:22 +05:00
be25b02de9 Fix help in 1-Click script 2022-12-22 11:33:56 +03:00
d8b1310d46 Fix 4testing repo connection for 1-Click 2022-12-22 11:32:50 +03:00
584088931e Rename yml file to 1CI 2022-12-12 14:07:20 +03:00
92cb24fa4c Update migration runner config name in packages 2022-12-09 17:25:38 +03:00
fb3af4d1c0 Build: Docker: fix run api-system 2022-12-09 16:37:19 +03:00
8f26594d59 Add api-system package 2022-12-09 15:33:40 +03:00
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +03:00
Viktor Fomin
fec44ec7c3 Build: Docker.dev: turn on apisystem 2022-12-09 11:12:57 +03:00
Viktor Fomin
de7734168a Build: Docker.dev: turn on apisystem 2022-12-09 10:55:57 +03:00
sk81.biz@gmail.com
0b5df01e77 Modify config name file for migration runner 2022-12-07 17:36:38 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
c43727f295
Remove services and update dependencies in packages (#1100)
* Remove services in packages

* Remove services in win package

* Update the nodejs version

* Update the elasticsearch version

* Change version when configuring elasticsearch in win package
2022-12-05 14:54:22 +03:00
b672359f70
Feature/package api system (#974)
* Add api-system package

* Minor edit of the api-system installation

* Fix a typo
2022-12-05 14:50:05 +03:00
b693486b46 merge from develop 2022-12-01 14:52:46 +03:00
9a2c392a96 Fix running tests on macos 2022-12-01 13:26:50 +03:00
5768244870 Added run document server docker for development. 2022-11-29 18:50:50 +03:00
a714937a2c Merge branch 'develop' into bugfix/access-rights 2022-11-24 22:14:26 +03:00
f8165f7640 Fixed Dockerfile.dev after merge 2022-11-24 21:36:13 +03:00
b77c6c9c03 Update Dockerfile.dev
Fix unknown "service_migration" variable
2022-11-24 21:35:00 +03:00
fa0146416b Update docspace.dev.yml
Restored variables for nginx upstream
2022-11-24 21:23:38 +03:00
Sergey Kirichenko
dfa948d5b3
Delete docker services (#1081) 2022-11-24 17:47:27 +03:00
c040870df1 Update build.backend.docker.ps1 2022-11-24 17:20:02 +03:00
6933d668eb Build: Added passing variable from command line 2022-11-24 15:39:38 +03:00
1f56cdf94b Build: Commented ASC.Notify and ASC.ApiSystem for Dockerfile.dev 2022-11-24 15:05:06 +03:00
28e1cb31a7 Build: Fixed warning with empty APP_DOTNET_ENV 2022-11-24 15:01:18 +03:00
d8dd8669b0 Build: Added .bat files: build.backend.docker.bat, start.backend.docker.bat, stop.backend.docker.bat, restart.backend.docker.bat, clear.backend.docker.bat 2022-11-24 15:00:42 +03:00
c0c8572ff9 Build: Renamed build.docker.bat to build.backend.docker.bat 2022-11-24 13:40:06 +03:00
c4323a7e7d Build: Removed from build: MigrationService, TelegramService, UrlShortenerService, Webhooks Server images 2022-11-24 13:38:07 +03:00
ec40329427 Build: Fixed issue with CLRF on windows docker build 2022-11-24 13:36:40 +03:00
950ab06035 removed build urlshortener.bat 2022-11-24 13:08:21 +03:00
372d104161 Merge branch 'develop' into feature/new-slnf 2022-11-24 11:27:30 +03:00
2f73ecb0cc Merge branch 'feature/win-docker' of https://github.com/ONLYOFFICE/DocSpace into feature/win-docker 2022-11-23 19:24:02 +03:00
57b257b9af Removed useless builds in docker dev for k8s 2022-11-23 19:23:56 +03:00
bd4ec8c77a Fix docker dev mysql version 2022-11-23 19:22:55 +03:00
3ceb194d5d Build: .env up MySQL version to 8.0.31 2022-11-23 19:07:08 +03:00
df450b1dd3 added slnf 2022-11-23 18:26:50 +03:00
531b469d90 Build: Fixed typo 2022-11-23 16:24:35 +03:00
4d2ca492fb Build: Fixed typo 2022-11-23 16:19:12 +03:00
307bd7e536 Build: Restored document server install 2022-11-23 14:55:38 +03:00
cae6ff52f7 Fixed if statement for "sh" scripts 2022-11-23 13:18:22 +03:00
2dbcdadf68 Build: Fixed getting current branch for "sh" scripts 2022-11-23 12:10:29 +03:00
ca596efefd Build: Added restart and clear scripts for docker 2022-11-23 12:08:51 +03:00
f3425ee8f5 Build: Added check for existence of remote repository 2022-11-22 13:01:52 +03:00
21a970573a Build: Fixed end of line CRLF > LF 2022-11-22 11:49:58 +03:00
23e7b3962f Added some fixed for build files 2022-11-21 22:30:13 +03:00
sk81.biz@gmail.com
af5829d92a Mod package.json origin: https://system.onlyoffice.io 2022-11-21 14:39:12 +03:00
8b6ddc145b Base windows docker builder 2022-11-21 11:17:19 +03:00
sk81.biz@gmail.com
d0119eda51 Fix run login, doceditor 2022-11-17 21:36:14 +03:00
sk81.biz@gmail.com
724749cbf0 Modify Dockerfile.app cmd config 2022-11-17 20:22:53 +03:00
sk81.biz@gmail.com
2814473cdd Add docker-entypoint for servises login, doceditor 2022-11-17 20:06:43 +03:00
9dfcd25033 backend: update dependency dll 2022-11-14 14:11:10 +03:00
290875d91d Update nodejs to v18.12.1 2022-11-10 17:53:55 +03:00
5d2c14c5b3 Added api-system to docker dev 2022-11-08 17:44:09 +03:00
Eugene Kozyrev
a49f3074be
Add enterprise build for Windows (#988) 2022-11-08 10:26:46 +02:00
0518c19426
Merge pull request #819 from ONLYOFFICE/feature/remove-waste
Feature/remove waste
2022-11-07 19:32:24 +03:00
d9b02f3f49 removed slnf 2022-11-07 19:23:31 +03:00
0f88170316 Fix yarn deploy on MacOS 2022-11-07 18:52:57 +03:00
bc358ae54c build: added scipt for change service start timeout 2022-11-07 14:57:05 +03:00
14a64f4ad0 Merge branch 'develop' into feature/remove-waste
# Conflicts:
#	common/services/ASC.ApiSystem/GlobalUsings.cs
#	common/services/ASC.ApiSystem/Program.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	products/ASC.CRM/Server/Classes/Global.cs
#	products/ASC.Files/Server/ProductEntryPoint.cs
#	web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
9b368efb53 Update build.backend.docker.sh 2022-11-02 18:09:08 +03:00
38950f567d Fix stop/restart and build docker backend
+ Changed DOCUMENT_SERVER_IMAGE_NAME to current release
2022-11-02 14:29:41 +03:00
803d1e1185 Update start.backend.docker.sh 2022-11-02 14:23:11 +03:00
6e64a7525f Create ds.dev.yml
+ Added opportunity to map license file inside Data/
2022-11-02 14:23:00 +03:00
ea132e83fc Create clear.backend.docker.sh 2022-11-02 14:22:05 +03:00
sk81.biz@gmail.com
a255f7d1cd Add check github 2022-11-01 10:17:29 +03:00
52b23cbf8b healthcheck: added to ApiSystem/ClearEvents services. refactoring 2022-10-31 16:13:45 +03:00
f7cee67855 Create .dockerignore 2022-10-28 20:30:32 +03:00
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
Sergey Kirichenko
bbf71a55eb Fix config copy 2022-06-17 09:31:24 +03:00
56ece27e1b moved from ddf515b8 2022-06-16 17:16:46 +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
Artem Tarasov
2eebeb3c1a Merge branch 'develop' into feature/doceditor-ssr 2022-06-14 11:22:23 +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
46ba74cc6f moved from ddf515b8 2022-06-09 20:33:08 +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
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +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
dbeed862ab Build: Removed old psl replacements 2022-05-20 19:13:01 +03:00
Timofey Boyko
394aafbe97 Add bat file for run e2e translations tests on personal 2022-05-19 15:26:36 +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
Artem Tarasov
38e06018e5 Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	packages/asc-web-common/api/client.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
#	web/ASC.Web.Client/src/components/pages/Home/index.js
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/src/StyledEditor.js
#	yarn.lock
2022-04-28 14:12:06 +03:00
99d133a1af build: Fix start services on run build/buildAndDeploy.PERSONAL.bat 2022-04-27 19:37:55 +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
9ed24ab115 Build: Removed onlyoffice-editor.conf replace command 2022-04-14 17:24:23 +03:00
b877354203 BackupBackgroundTasks: port changed 2022-04-13 19:13:37 +03:00