Lea/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
397 commits 12 branches 2802 tags 1.1 MiB
Commit graph

397 commits

This branch
This branch
All branches
Author SHA1 Message Date
papacarlo cbb749d77c Merge branch hotfix/v6.2.1 into develop 2021-03-31 11:27:26 +00:00
jdoubleu 1cfe84b8b8
Fix automatic port detection for database (#341) 2021-03-19 16:20:52 +03:00
papacarlo 30ca844513 Merge branch release/v6.2.0 into release/v6.3.0 2021-03-19 07:54:45 +00:00
papacarlo c611b2b080 Merge branch release/v6.2.0 into develop 2021-03-18 15:22:47 +00:00
papacarlo 9dc5f5d993 Merge branch release/v6.2.0 into master 2021-03-01 08:47:27 +00:00
Semyon Bezrukov 393006d306
Add pull ubuntu image (#334) 2021-02-24 18:34:03 +03:00
papacarlo ea0fcf3951 Merge branch hotfix/v6.1.1 into develop 2021-01-28 08:28:05 +00:00
Alexey Golubev cbff89bdea
Merge pull request #323 from ONLYOFFICE/hotfix/v6.1.1 
Merge hotfix/v6.1.1 into release/v6.2.0
 2020-12-25 11:31:19 +03:00
papacarlo 9676e7aac1 Merge branch release/v6.1.0 into develop 2020-12-24 07:52:11 +00:00
Semyon Bezrukov e7d2cc2cd5
Edit s3 paths (#319) 
* Edit s3 paths

* DocumentServer installed by url

* Fix install recommends
 2020-12-16 11:39:05 +03:00
papacarlo 93740b7c37 Merge branch release/v6.1.0 into master 2020-12-08 07:07:57 +00:00
papacarlo d26fd0d234 Merge branch hotfix/v6.0.2 into release/v6.1.0 2020-12-07 14:38:53 +00:00
papacarlo fd7e1a926a Merge branch hotfix/v6.0.2 into develop 2020-12-07 14:38:43 +00:00
papacarlo 4cc63380f2 Merge branch release/v6.1.0 into master 2020-12-01 07:51:32 +00:00
Alexey Golubev eddbbbf3eb
Fix unsupported rabbitmq ver. Use 20.04 as base. (#307) 
* Fix unsupported rabbitmq ver. Use 20.04 as base.

* Extend timeout for test (#311)

* test01

* Timeout

* Small changes

* Change timeout to 90

Co-authored-by: Roman Demidov <roman.demidov@onlyoffice.com>
 2020-11-20 10:53:36 +03:00
Roman Demidov 326a005ac7
Fix empty lets encrypt params error (#310) 2020-11-18 10:46:19 +03:00
Alexey Golubev cd02cd6deb
Merge pull request #309 from zhaofengli/netcat-ipv6 
Use netcat-openbsd for IPv6 support
 2020-11-09 14:05:04 +03:00
Zhaofeng Li 94c64d3f6d Use netcat-openbsd for IPv6 support 2020-11-08 23:38:31 -08:00
papacarlo f85ac8c510 Merge branch hotfix/v6.0.1 into release/v6.1.0 2020-10-28 14:31:41 +00:00
papacarlo 0ed3f8fbbf Merge branch hotfix/v6.0.1 into develop 2020-10-28 14:31:31 +00:00
evgeniy-antonyuk 9e63609c14
Fix custom db name bug (#304) 
Co-authored-by: papacarlo <builder@onlyoffice.com>
 2020-10-27 13:50:48 +03:00
Roman Demidov bdef500858
Allow let's encrypte sertificates (#300) 
* Allow let's encrypte sertificates

Co-authored-by: papacarlo <builder@onlyoffice.com>
Co-authored-by: Roman <demidov.roman@onlyoffice.com>
 2020-10-22 13:47:51 +03:00
Roman Demidov 211ae50980
Fix #281: Add option to disable CPU-heavy tasks on startup (#293) 
* Fix #281: Add option to disable CPU-heavy tasks on startup

* Update README.md

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

* Update README.md

Co-authored-by: Roman <demidov.roman@onlyoffice.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2020-10-20 16:14:55 +03:00
hellonadya a231d7992a
Update README.md (#301) 
- add info on OO Docs & OO Workspace
 2020-10-16 16:48:43 +03:00
Roman Demidov 26854106a3
Add consent to the fonts license (#297) 
* Add concent to the fonts license

* Small changes

* Small changes

Co-authored-by: papacarlo <builder@onlyoffice.com>
Co-authored-by: Roman <demidov.roman@onlyoffice.com>
 2020-10-08 15:58:07 +03:00
papacarlo 85158c3624 Merge branch release/v6.0.0 into develop 2020-09-30 15:15:35 +00:00
papacarlo f24908eb7a Merge branch release/v6.0.0 into master 2020-09-30 15:15:26 +00:00
Pierre Ozoux 1956f98c1d
Fixes exit procedure. (#286) 2020-09-10 17:02:20 +03:00
Semyon Bezrukov ecb77ddb56
Add more travis tests (#289) 
* Add version variable for travis tests

* Fix typo

* Fix activemq variable

* Add travis tests

* Remove mysql latest

* Fixes & refactoring

* Add more travis tests

* Remove mysql 8 test

* Remove mysql 8 test [2]

* Add mysql 8 comment

* Fix mysql 8 auth plugin

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
 2020-09-10 16:57:21 +03:00
papacarlo d3e5246e9a Merge branch hotfix/v5.6.4 into release/v6.0.0 2020-09-08 08:31:06 +00:00
papacarlo 380ac3e227 Merge branch hotfix/v5.6.4 into develop 2020-09-08 08:30:56 +00:00
Kim Brose 16107fd3ba
Update README.md (#283) 2020-08-17 16:08:52 +03:00
papacarlo ee126870b2 Merge branch hotfix/v5.6.2 into release/v6.0.0 2020-08-07 08:17:06 +00:00
papacarlo abe349dad9 Merge branch hotfix/v5.6.2 into develop 2020-08-07 08:16:55 +00:00
papacarlo ac0c135ded Merge branch hotfix/v5.6.1 into release/v6.0.0 2020-08-05 09:39:37 +00:00
papacarlo c5d15c3be7 Merge branch hotfix/v5.6.1 into develop 2020-08-05 09:39:26 +00:00
papacarlo 79e627e080 Merge branch hotfix/v5.6.1 into master 2020-08-05 09:39:15 +00:00
Semen Bezrukov dd5cde1919 Fix unary operator expected (Bug 45985) 2020-07-31 18:09:51 +03:00
Semyon Bezrukov c47a310683
Fix unary operator expected (Bug 45985) (#270) 2020-07-30 11:54:46 +03:00
papacarlo 0d974b9f2a Merge branch hotfix/v5.6.0 into release/v6.0.0 2020-07-28 13:48:40 +00:00
papacarlo be27b2b4d6 Merge branch hotfix/v5.6.0 into develop 2020-07-28 13:48:30 +00:00
papacarlo 98f96d1795 Merge branch hotfix/v5.6.0 into master 2020-07-28 13:48:20 +00:00
Semyon Bezrukov 7bfe250035
Add Graphite (#265) 2020-07-23 15:42:17 +03:00
Semyon Bezrukov e47d6d8c1a
Add several attempts for docker push (#258) 
* Add several attempts for docker push

* Fix retries, add delay
 2020-06-17 11:24:52 +03:00
Semyon Bezrukov 7193b651ec
Add test for Integration Edition (#256) 
* Add test for Integration Edition

* Add test for Community Edition

* Fix tests for redis

* Fix edition test

* Rename test
 2020-06-04 17:24:07 +03:00
Semyon Bezrukov 62424ea120
Disable redis server for Community Edition (#255) 
* Disable redis server

* Add REDIS_ENABLED variable

* Fix Dockerfile

* Fix REDIS_ENABLED condition
 2020-06-04 15:15:34 +03:00
Alexey Golubev c2bcd00322 v5.5.3 2020-05-22 11:25:18 +03:00
Alexey Golubev 91815ac24a v5.5.3 2020-05-22 11:21:42 +03:00
Semyon Bezrukov f6b5017b4a
Rename cert & key files (#245) 
* New cert files default names

* Add certs travis test

* Add certificate generation

* Fix certs test

* Fix cert gen

* Fix directory mapping

* Fix https healthcheck

* Add test for old cert path

* Fix script & test

* Fix port number

* Code refactoring

* Fix old cert test

* Code refactoring

* Fix certs test names

* Remove unnecessary test
 2020-04-29 19:48:33 +03:00
Semyon Bezrukov ab5637a11f Update travis tests (#243) 
* Remove docker .env file

* Add enviroment variables defaults

* Update docker-compose version

* Update travis tests variables

* Build document server image

* Fix mariadb

* Fix variable names

* Revert container name

(cherry picked from commit e721ca102d)
 2020-04-28 15:23:27 +03:00