Commit Graph

209 Commits

Author SHA1 Message Date
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
d696f18801 Jenkinsfile: fix notify 2021-02-24 15:37:40 +03:00
7ce0aa896d Jenkins: fixed tests 2021-02-19 15:07:44 +03:00
Ilya Oleshko
f2f2fbc07c Merge branch 'develop' into feature/not-implemented-page 2021-02-15 10:58:34 +03:00
f3cd204b14 Jenkins: run "notify" stage only once at first build 2021-02-10 16:03:44 +03:00
61cfd029d9 Added CRM 2021-01-26 20:36:03 +03:00
69922e7c48 Added ASC.Projects 2021-01-26 12:32:31 +03:00
88f37bdfc6
Merge branch 'develop' into feature/multi-stage-docker-env 2021-01-18 15:25:45 +03:00
Sergey Kirichenko
525654fdef Correct spelling 2021-01-18 15:09:43 +03:00
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
9f8b36da5c Files: tests. log 2021-01-12 19:00:22 +03:00
19c9001082 Files: fix test 2021-01-12 18:32:05 +03:00
122048dd49 Files: temp fix 2021-01-12 18:27:56 +03:00
5289f92935 Files: temp fix 2021-01-12 18:01:38 +03:00
42e4fdcb37 Jenkins: remove temp 2021-01-12 10:32:55 +03:00
5bf44cbcff Test: fix 2021-01-11 20:19:43 +03:00
8529593c42 Jenkinsfile: run test 2021-01-11 19:51:45 +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
e872a0118a build: Uncommented call bat 2020-10-23 13:36:25 +03:00
4e52a84db1 Build: Added new bat files 2020-10-23 13:12:17 +03:00
18ef6e7cb6 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2020-10-16 16:57:21 +03:00
0631da043b extract build.sln.bat 2020-10-14 18:24:39 +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
2c1d473314 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2020-09-28 12:29:33 +03:00
0dbae1adfd Merge branch 'master' into feature/files 2020-09-28 11:32:13 +03:00
SuhorukovAnton
693e35ac57 add ASC.TelegramService 2020-09-24 17:30:27 +03:00
886c7d6464 Merge branch 'master' into feature/files 2020-09-07 18:16:33 +03:00
SuhorukovAnton
2d3f183567 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-07 17:00:48 +03:00
SuhorukovAnton
fc80c8e067 encryption: add bat 2020-09-05 23:08:00 +03:00
66009ff013 Jenkins: fix 2020-09-04 14:44:58 +03:00
e6f9e88bb8 new jenkins server 2020-09-03 18:49:43 +03:00
29d9f21d05 Merge branch 'master' into feature/files
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
2020-08-31 17:45:57 +03:00
maksim
95299daaf9 ASC.Data.Storage.Migration: adding listener and extension 2020-08-27 17:06:03 +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
maksim
eb58c24d2e LaunchSettings: fix 2020-08-24 10:45:51 +03:00
maksim
eecf23f214 ASC.Data.Storage.Migration: bugfix 2020-08-24 09:52:17 +03:00
b06a4b4991 Merge branch 'master' into feature/socket.io
# Conflicts:
#	ASC.Web.sln
#	thirdparty.sln
#	thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj
2020-08-21 15:25:07 +03:00
cff1a01f70 Docker: fix build 2020-08-20 19:04:13 +03:00
SuhorukovAnton
4db1cd0af8 Merge branch 'master' into feature/socket.io 2020-08-14 14:01:27 +03:00
Ilya Oleshko
37fe1cab21 Merge branch 'master' into feature/files 2020-08-12 18:05:29 +03:00
SuhorukovAnton
112a378d28 socket: add bat 2020-08-09 11:34:09 +03:00
SuhorukovAnton
b5ff2b9feb socket.io: fix 2020-08-03 11:20:57 +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