Commit Graph

485 Commits

Author SHA1 Message Date
Alexey Golubev
f8064da1fd Merge tag 'v4.1.2' into develop
v4.1.2
2016-09-22 12:03:35 +03:00
Alexey Golubev
a4bc2294d5 Merge branch 'hotfix/v4.1.2' 2016-09-22 12:03:11 +03:00
Alexey Golubev
23107e65d0 use cdn url 2016-09-13 11:57:48 +03:00
Alexey.Golubev
9cac2cdf42 Fixed Makefile:7: *** missing separator. Stop. 2016-09-12 20:03:05 +03:00
Alexey Golubev
00ed64fa7c Update latest tag when build from next branch
release
develop
hotfix
2016-09-12 19:26:54 +03:00
Alexey Golubev
6a8bdfe6ba Merge pull request #21 from ONLYOFFICE/hotfix/v4.1.1
set public docker image
2016-09-12 14:09:55 +03:00
Alexey Golubev
704bfff215 set public docker image 2016-09-12 14:09:25 +03:00
Alexey Golubev
b03f07b8a1 Merge pull request #20 from ONLYOFFICE/hotfix/v4.1.1
Use release repo for documentserver
2016-09-09 11:50:17 +03:00
Alexey Golubev
27f4bdaf53 Use release repo for documentserver 2016-09-09 11:49:14 +03:00
Alexey Golubev
24d8fd6a97 Merge tag 'v4.1.0' into develop
v4.1.0
2016-09-05 13:48:07 +03:00
Alexey Golubev
7b5dda41a9 Merge branch 'release/v4.1.0' 2016-09-05 13:46:29 +03:00
Alexey Golubev
fa6b305fd4 Remove custom postgresql 2016-08-31 19:09:25 +03:00
Alexey Golubev
fdf21d1a8c Fixed build error 2016-08-31 14:47:26 +03:00
Alexey Golubev
a5ebbe5cb4 read product name from env variable 2016-08-31 14:06:41 +03:00
Alexey Golubev
a015fe4c8c Moved down REPO_URL to enable caching 2016-08-31 11:22:25 +03:00
Alexey Golubev
7d60ffe26d Merge pull request #19 from alexandervnuchkov/patch-3
Update README.md
2016-08-30 18:53:24 +03:00
Alexey Golubev
5ef37630c5 Use ARG to set up documentserver repo 2016-08-30 17:06:02 +03:00
alexandervnuchkov
2518588d7f Update README.md
Added link to Stack Overflow
2016-08-30 16:44:04 +03:00
Alexey Golubev
4236d71fe3 Merge pull request #18 from ONLYOFFICE/master
Back merge from master
2016-08-26 17:25:01 +03:00
Alexey Golubev
65fe888648 Merge pull request #16 from alexandervnuchkov/patch-2
Update README.md
2016-08-26 17:23:00 +03:00
Alexey Golubev
6ea703a44c MySQL -> PostgreSQL 2016-08-26 17:02:51 +03:00
Alexey Golubev
83582dd9c6 Add a postgre key without storing a file on disk 2016-08-26 15:44:32 +03:00
Alexey Golubev
4a362b008c changed user name for db 2016-08-26 15:20:13 +03:00
Alexey Golubev
2d67dfe27d fixed misprint 2016-08-26 15:10:53 +03:00
Alexey Golubev
e14b97bd76 Create db and user before install documentserver 2016-08-26 13:39:29 +03:00
Alexey Golubev
6956f21194 fixed misprint 2016-08-26 12:18:53 +03:00
Alexey Golubev
b9f9ed6ba5 mysql -> postgresql 2016-08-25 19:52:14 +03:00
Alexey Golubev
4859e8f422 Removed setup max connection count 2016-08-23 17:22:42 +03:00
Alexey Golubev
befb9c1c65 Increase max comnections count 2016-08-23 13:45:53 +03:00
Alexey Golubev
e3b22c436c Excluded unused backend 2016-08-17 15:54:19 +03:00
alexandervnuchkov
48eb2b4afb Update README.md 2016-08-03 15:09:21 +03:00
Alexey Golubev
5eb38213d3 Merge pull request #14 from ONLYOFFICE/master
Added a docker params description
2016-07-29 15:06:58 +03:00
Alexey Golubev
5b9c158da2 Merge pull request #12 from ONLYOFFICE/docker-params
Added thr docker params description
2016-07-29 15:04:19 +03:00
Alexey Golubev
e40bec3bac Merge pull request #13 from alexandervnuchkov/patch-1
Corrections for README.md
2016-07-29 15:03:34 +03:00
Alexey Golubev
28ac7a080a Update Dockerfile 2016-07-28 12:39:56 +03:00
alexandervnuchkov
be0a9e50c1 Corrections for README.md 2016-07-28 12:23:41 +03:00
Alexey Golubev
d262c96c11 Update README.md 2016-07-28 12:13:29 +03:00
Alexey Golubev
bad15130c4 Merge pull request #11 from ONLYOFFICE/master
Update README.md
2016-07-27 18:31:49 +03:00
Alexey.Golubev
c515adf693 Remade setup a docker version 2016-07-27 16:13:52 +03:00
Alexey Golubev
421b24c01c Fixed build crash 2016-07-27 15:24:47 +03:00
Alexey Golubev
8ec2fe79a5 Changed version from X.X.X-X to X.X.X.X 2016-07-27 14:27:54 +03:00
Alexey Golubev
05c96650fd Update docker-compose.yml
Fixed ERROR: An HTTP request took too long to complete.
2016-07-27 12:18:30 +03:00
Alexey Golubev
e7b7e7dd1a made availability check the data container to ensure the correct order of starting the containers 2016-07-20 18:56:20 +03:00
Alexey Golubev
d0e1228330 Merge pull request #10 from ONLYOFFICE/feature/docker-compose
Feature/docker compose
2016-07-15 17:20:45 +03:00
Alexey Golubev
dd27f00a62 Seach for the string "true" in a http body when healthcheack service 2016-07-15 17:14:18 +03:00
Alexey Golubev
b1053d4512 Merge branch 'feature/docker-compose' of https://github.com/ONLYOFFICE/Docker-DocumentServer into feature/docker-compose 2016-07-15 16:35:23 +03:00
Alexey Golubev
a813036830 Updated haproxy container, removed virtual host, added templates for ssl 2016-07-15 16:31:53 +03:00
Alexey Golubev
ad64cea8ec removed unused code 2016-07-12 17:27:04 +03:00
Alexey.Golubev
7955487352 Added uri balanced type. 2016-07-12 15:37:09 +03:00
Alexey.Golubev
0dd2cc1e59 use http proxy instead of tcp proxy. 2016-07-12 15:07:52 +03:00