Commit Graph

640 Commits

Author SHA1 Message Date
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