Merge tag 'v4.3.1' into develop

v4.3.1 v4.3.1
This commit is contained in:
Alexey Golubev 2017-04-05 17:58:26 +03:00
commit a0cc6ab7ba
2 changed files with 7 additions and 13 deletions

@ -5,20 +5,12 @@ REPO_URL := "deb http://repo-doc-onlyoffice-com.s3.amazonaws.com/ubuntu/trusty/$
UPDATE_LATEST := false
ifneq (,$(findstring develop,$(GIT_BRANCH)))
UPDATE_LATEST := true
endif
ifneq (,$(findstring release,$(GIT_BRANCH)))
UPDATE_LATEST := true
endif
ifneq (,$(findstring hotfix,$(GIT_BRANCH)))
UPDATE_LATEST := true
endif
ifeq ($(UPDATE_LATEST), true)
DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))
DOCKER_TAGS += latest
else ifneq (,$(findstring release,$(GIT_BRANCH)))
DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))
else ifneq (,$(findstring hotfix,$(GIT_BRANCH)))
DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))
else
DOCKER_TAGS += $(subst -,.,$(PACKAGE_VERSION))-$(subst /,-,$(GIT_BRANCH))
endif

@ -63,7 +63,8 @@ To get access to your data from outside the container, you need to mount the vol
sudo docker run -i -t -d -p 80:80 \
-v /app/onlyoffice/DocumentServer/logs:/var/log/onlyoffice \
-v /app/onlyoffice/DocumentServer/data:/var/www/onlyoffice/Data onlyoffice/documentserver
-v /app/onlyoffice/DocumentServer/data:/var/www/onlyoffice/Data \
-v /app/onlyoffice/DocumentServer/lib:/var/lib/onlyoffice onlyoffice/documentserver
Storing the data on the host machine allows you to easily update ONLYOFFICE once the new version is released without losing your data.
@ -183,6 +184,7 @@ Than launch containers on it using the 'docker run --net onlyoffice' option:
sudo docker run --net onlyoffice -i -t -d --restart=always --name onlyoffice-document-server \
-v /app/onlyoffice/DocumentServer/data:/var/www/onlyoffice/Data \
-v /app/onlyoffice/DocumentServer/logs:/var/log/onlyoffice \
-v /app/onlyoffice/DocumentServer/lib:/var/lib/onlyoffice \
onlyoffice/documentserver
```