From 468420cfcda96544159b79f4b56df3e66f28a748 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Mon, 3 Apr 2017 14:34:21 +0300 Subject: [PATCH 1/4] Update 'latest' tag only for develop build --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f8fd661..6a95be7 100644 --- a/Makefile +++ b/Makefile @@ -9,11 +9,11 @@ UPDATE_LATEST := true endif ifneq (,$(findstring release,$(GIT_BRANCH))) -UPDATE_LATEST := true +UPDATE_LATEST := false endif ifneq (,$(findstring hotfix,$(GIT_BRANCH))) -UPDATE_LATEST := true +UPDATE_LATEST := false endif ifeq ($(UPDATE_LATEST), true) From 84bbcd78b7300dc39cfdb28c2694a0e53a278a33 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Tue, 4 Apr 2017 11:06:22 +0300 Subject: [PATCH 2/4] Fixed tag for release and hotfix --- Makefile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 6a95be7..7a51308 100644 --- a/Makefile +++ b/Makefile @@ -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 := false -endif - -ifneq (,$(findstring hotfix,$(GIT_BRANCH))) -UPDATE_LATEST := false -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 From f3d9d9b9f931f67540303b21a0f02876c56f5c8e Mon Sep 17 00:00:00 2001 From: Henri Wahl Date: Wed, 5 Apr 2017 11:11:54 +0200 Subject: [PATCH 3/4] Added import of /var/lib/onlyoffice --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5960fdd..3255b97 100644 --- a/README.md +++ b/README.md @@ -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 ``` From 57759c43d924a022d078a970cd6a42f5d4e6197d Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 5 Apr 2017 12:26:27 +0300 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3255b97..9da5f6e 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ 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 \ - -v /app/onlyoffice/DocumentServer/lib:/var/lib/onlyoffice onlyoffice/documentserver + -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.