Commit Graph

243 Commits

Author SHA1 Message Date
04ae58382f
Add parameters for type migration (#1483) 2023-06-22 13:41:47 +05:00
47fa64d035 Correct the error set external: true to use an existing network 2023-06-21 21:02:49 +05:00
3d619fcc16 Add to docspace.yml APP_URL_PORTAL env 2023-06-20 18:21:15 +03:00
0be51699ac fix Bug 63001 - Correct the installation type setting 2023-06-13 11:19:57 +05:00
d9d6a48e50 Add configuration of the enterprise version of docker 2023-05-31 16:37:42 +05:00
94388c0616 Merge branch 'hotfix/v1.0.1' into feature/standalone 2023-05-23 17:00:12 +03:00
35ff53d69b Docker:Dev: Added mapping /Data on host (DS license issue) 2023-05-17 13:53:46 +04:00
29b6d20314
Bugfix/Fix services updates and optimize value retrieval in Docker OCI (#1418)
* Fix found orphan containers for this project warning

* Fix getting the machinekey

* Fix mysql data retrieval and substitution

* Fix services updates and optimize value retrieval

* Correct the help
2023-05-16 18:54:58 +05:00
1836a8d8c7 docker: fixed forward params 2023-05-04 15:17:34 +03:00
e1c8226587 docker: forward knows_networks, known_proxies params 2023-05-04 14:15:19 +03:00
f9b3e30409 docker: fixed 2023-05-03 11:53:44 +03:00
f1fba8a19a docker: added docker subnet to .net knownNetworks 2023-05-02 18:01:33 +03:00
e60870df1c docker: fixed command 2023-04-28 18:57:33 +03:00
dc6301ee2f docker: added configuration parameter to docker publish 2023-04-28 18:51:57 +03:00
sk81.biz@gmail.com
721676f662 Del dev config json files 2023-04-21 13:11:22 +03:00
70d3f98633 Docker: Dev: Enabled SSO 2023-04-18 14:34:03 +04:00
Sergey Kirichenko
41496fb47d
Add codecs for file-services (#1353)
* Modify repo for ffvideo

* Add codecs for file-services
2023-04-13 23:12:17 +05:00
a52846fd91 Fix build Docker dev 2023-04-12 23:55:38 +04:00
Sergey Kirichenko
940fc91ca8
Add build ffvideo (#1343)
* Modify build version ffmpeg from 4 to 6

* Add software-properties-common for file-services

* Fix buiild

* Fix buiild

* Modify docker build ffmpeg6

* Testing build ffmpeg 6

* Add ffmpeg 6

* Add build ffvideo for file-services
2023-04-12 15:03:10 +05:00
Sergey Kirichenko
2238a82444
Add docker healthchek for dotnet containers (#1330) 2023-04-04 18:34:14 +05:00
56bda92e55 Build: Fixed obsolete parameter application 2023-03-24 09:59:48 +03:00
70f5314102 Build: Fixed commands for Dockerfile.dev 2023-03-24 09:58:31 +03:00
dd9ddcfb7d Docker: Dev: Commented elastic, clear-events, api-system, ssoauth 2023-03-22 18:38:01 +04:00
Sergey Kirichenko
b28a3e940f
Add feature to configure apisystem by runnitng (#1312) 2023-03-22 16:44:49 +05: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
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
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
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
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
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
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
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
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
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
fb3af4d1c0 Build: Docker: fix run api-system 2022-12-09 16:37:19 +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
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +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
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
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
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
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
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
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
6e64a7525f Create ds.dev.yml
+ Added opportunity to map license file inside Data/
2022-11-02 14:23:00 +03:00
sk81.biz@gmail.com
a255f7d1cd Add check github 2022-11-01 10:17:29 +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
Sergey Kirichenko
0b8360a0d7
Add docker image api_system (#954) 2022-10-27 13:39:21 +03:00
56ef525cde Removed --depth 1 on git clone 2022-10-19 18:41:24 +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
1d0dddf196 Added mapping appsettings.dev.json from substitutions 2022-10-15 07:32:52 +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
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
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
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
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