Commit graph

340 commits

Author SHA1 Message Date
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
Alexey Golubev
278bdd870e Merge branch 'hotfix/v4.3.2' 2017-04-17 14:58:56 +03:00
Alexey Golubev
0d8f2ed1a7 Fixed missprint 2017-04-12 14:46:06 +03:00
Alexey Golubev
a0cc6ab7ba Merge tag 'v4.3.1' into develop
v4.3.1 v4.3.1
2017-04-05 17:58:26 +03:00
Alexey Golubev
3e86381bb8 Merge branch 'hotfix/v4.3.1' 2017-04-05 17:58:23 +03:00
Alex
57759c43d9 Update README.md 2017-04-05 12:26:27 +03:00
Alex
7a14e43467 Merge pull request #37 from HenriWahl/master
Added import of /var/lib/onlyoffice
2017-04-05 12:24:30 +03:00
Henri Wahl
f3d9d9b9f9 Added import of /var/lib/onlyoffice 2017-04-05 11:11:54 +02:00
Alexey Golubev
84bbcd78b7 Fixed tag for release and hotfix 2017-04-04 11:06:22 +03:00
Alexey Golubev
468420cfcd Update 'latest' tag only for develop build 2017-04-03 14:34:21 +03:00
Alexey Golubev
d31b9e8454 Merge tag 'v4.3.0' into develop
v4.3.0
2017-04-03 12:57:15 +03:00
Alexey Golubev
adf29bc63b Merge branch 'release/v4.3.0' 2017-04-03 12:56:49 +03:00
Alexey Golubev
ac86f08696 Merge tag 'v4.2.11' into develop
v4.2.11 v4.2.11
2017-03-13 10:44:45 +03:00
Alexey Golubev
716f9afb94 Merge pull request #30 from ONLYOFFICE/feature/nginx-params-description
Added nginx params description.
2017-02-27 11:03:45 +03:00
Alexey Golubev
387d1d0cb9 Merge pull request #29 from ONLYOFFICE/feature/nginx-params-description
Added nginx params description.
2017-02-27 10:58:20 +03:00
Alexey Golubev
259d6df478 Added nginx params description. 2017-02-27 10:50:47 +03:00
Alexey.Golubev
1047e5189a Use nginx config from the package 2017-01-24 19:34:20 +03:00
Alexey Golubev
b60bd1cebb Export folder for the custom fonts 2017-01-18 14:13:24 +03:00
Alexey.Golubev
3f8c314da0 tune welcome page 2017-01-17 16:15:54 +03:00
Alexey.Golubev
dd08a39bed Added "How to run DS on different port" 2017-01-13 12:50:24 +03:00
Alexey Golubev
43806526d5 Changed GPG key for the onlyoffice repo 2016-12-26 19:23:14 +03:00
Alexey Golubev
be3f768358 Changed rabbitmq settings 2016-12-09 15:56:11 +03:00
Alexey Golubev
daa1850ed8 Adde to install postgresql-client 2016-12-09 13:10:37 +03:00
Alexey Golubev
c3fbb79748 Merge tag 'v4.2.0' into develop
v4.2.0 v4.2.0
2016-12-05 11:38:57 +03:00
Alexey Golubev
ab992841fd Merge branch 'release/v4.2.0' 2016-12-05 11:38:55 +03:00
Alexey Golubev
8b812ac491 fixed warning: setlocale: LC_ALL: cannot change... 2016-11-23 17:16:59 +03:00