Commit graph

365 commits

Author SHA1 Message Date
Alexey Golubev
9cceb81469 Merge pull request #77 from ONLYOFFICE/feature/bugfix-issue76
Fixed bug #76
2017-10-23 17:32:05 +03:00
Alexey Golubev
ae259d64e5 Merge 2017-10-13 14:44:53 +03:00
Alexey Golubev
417d62e8d4 Fixed bug #76
Bug on launchpad.net:
https://bugs.launchpad.net/ubuntu/+source/msttcorefonts/+bug/1465721
2017-10-12 18:47:47 +03:00
Alexey Golubev
bbf336a980 v5.0.1 2017-10-05 14:48:06 +03:00
Alexey Golubev
3efb68e169 v5.0.1 2017-10-05 14:46:28 +03:00
Alexey Golubev
990a0ab127 Set NGINX_WORKER_PROCESSES=1 by default 2017-09-20 17:25:38 +03:00
Alexey Golubev
306926402c v5.0.0 2017-09-19 17:28:44 +03:00
Alexey Golubev
7f8c4fd3e8 v5.0.0 2017-09-19 17:04:56 +03:00
Alexey Golubev
5a0a4be801 Merge pull request #72 from ONLYOFFICE/feature/jwt-description
Added description to jwt params
2017-09-12 11:50:02 +03:00
Alexey Golubev
9559beeddf Added description to jwt params 2017-09-11 19:02:19 +03:00
Alexey Golubev
1e012972c9 Merge pull request #71 from ONLYOFFICE/feature/jwt
Added jwt setup to example
2017-09-06 17:23:32 +03:00
Alexey Golubev
6cf41fa955 Added jwt setup to example 2017-09-06 17:21:52 +03:00
Alexey Golubev
bcdf1ebd78 Merge pull request #70 from ONLYOFFICE/feature/jwt
Added jwt params
2017-09-01 17:30:59 +03:00
Alexey Golubev
ef8826aca4 Added jwt params 2017-09-01 16:59:34 +03:00
Alexey Golubev
914ffa6de2 Merge pull request #67 from ONLYOFFICE/alexandervnuchkov-patch-1
Update README.md
2017-08-04 17:07:43 +03:00
alexandervnuchkov
716a85ef6d Update README.md 2017-08-04 14:02:42 +03:00
alexandervnuchkov
58f6e1cc8e Update README.md 2017-08-04 13:37:13 +03:00
Alexey Golubev
b3bb7ec642 Merge pull request #66 from ONLYOFFICE/feature/fix-description
Update README.md
2017-07-28 11:36:51 +03:00
Alexey Golubev
f52ad9f804 Update README.md 2017-07-27 11:41:30 +03:00
Alexey Golubev
64f3e1b19b Merge tag 'v4.4.1' into develop
v4.4.1
2017-07-05 11:47:38 +03:00
Alexey Golubev
20063dfe03 Merge branch 'release/v4.4.1' 2017-07-05 11:47:08 +03:00
Alexey Golubev
b663638b95 Merge pull request #62 from ONLYOFFICE/feature/optimize-dockerfile
Minor Dockerfile optimization
2017-06-21 11:34:53 +03:00
Pavel Lobashov
dd9583498a
Split long apt-get and sort it 2017-06-20 19:08:07 +03:00
Pavel Lobashov
810d49fd53
Remove specific version of update-notifier-common
Bug was fixed
https://bugs.launchpad.net/ubuntu/+source/update-notifier/+bug/1683713
2017-06-20 18:54:59 +03:00
Alexey Golubev
91c987705c Merge pull request #61 from ShockwaveNN/patch-1
Use COPY instead of ADD
2017-06-20 18:18:10 +03:00
Pavel Lobashov
f859561507 Use COPY instead of add
According to https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#add-or-copy
It's prefered to use COPY if no need to extract tars
2017-06-20 17:31:20 +03:00
Alexey Golubev
5c15c04ebe Merge tag 'v4.3.5' into develop
v4.3.5 v4.3.5
2017-06-05 16:48:05 +03:00
Alexey Golubev
c2117fce29 Merge branch 'hotfix/v4.3.5' 2017-06-05 16:46:11 +03:00
Alexey Golubev
d2003e9516 Merge pull request #53 from ShockwaveNN/patch-1
Change `MAINTAINER` line to `LABEL`
2017-05-23 11:10:07 +03:00
Pavel Lobashov
3f8ac6ee7e Change MAINTAINER line to label
According to https://docs.docker.com/engine/reference/builder/#maintainer-deprecated
`MAINTAINER` is deprecated, and `LABEL maintainer` should be used, since it give more flexebility
2017-05-22 11:49:46 +03:00
Alexey Golubev
e0686e5927 Merge pull request #52 from ONLYOFFICE/feature/ssl-simple
Changes for simple config
2017-05-19 15:15:54 +03:00
Alexey Golubev
af131c3007 debug 2017-05-17 17:44:25 +03:00
Alexey Golubev
9f1048c9f7 Setup default params for make 2017-05-17 17:43:24 +03:00
Alexey Golubev
dfceae2523 Added log level configuration parameter 2017-05-17 17:41:13 +03:00
Alexey Golubev
c3c6a356d7 Cosmetic 2017-05-17 16:35:54 +03:00
Alexey Golubev
d9003c5bae Merge pull request #49 from ONLYOFFICE/feature/ssl-simple
Changes for simple config
2017-05-12 16:58:40 +03:00
Alexey Golubev
32e1c4b1cc Changes for simple config 2017-05-12 16:51:22 +03:00
Alexey Golubev
a96a5f7048 Merge tag 'v4.3.3' into develop
v4.3.3 v4.3.3
2017-04-28 12:44:04 +03:00
Alexey Golubev
47f2766920 Merge branch 'hotfix/v4.3.3' 2017-04-28 12:44:02 +03:00
Alexey Golubev
8ae9329c8e Added pwgen 2017-04-26 19:03:42 +03:00
Alexey Golubev
61a56eb31e Removed unused code 2017-04-25 16:09:38 +03:00
Alexey Golubev
1b8b77c03b Merge pull request #46 from ONLYOFFICE/feature/mount-var-lib
Feature/mount var lib
2017-04-25 15:09:45 +03:00
Alexey Golubev
452b31f235 Merge pull request #45 from ONLYOFFICE/feature/mount-var-lib
debug
2017-04-25 14:30:50 +03:00
Alexey Golubev
f59f75fd69 debug 2017-04-25 14:29:24 +03:00
Alexey Golubev
be8d335063 Merge pull request #44 from ONLYOFFICE/feature/mount-var-lib
Feature/mount var lib
2017-04-24 20:04:31 +03:00
Alexey.Golubev
2fd4086173 Added /var/lib/postgresql volume 2017-04-24 20:02:01 +03:00
Alexey Golubev
89ad87d538 Merge pull request #42 from dienteperro/patch-1
Update README.md
2017-04-21 11:55:10 +03:00
dienteperro
853f2b4de8 Update README.md 2017-04-19 17:04:19 -04:00
Alexey Golubev
77f7b813f7 Fixed installation ttf-mscorefonts-installer 2017-04-18 14:31:05 +03:00
Alexey Golubev
ced029b304 Merge tag 'v4.3.2' into develop
v4.3.2 v4.3.2
2017-04-17 14:58:59 +03:00