From 27f4bdaf532becfc75ff4205be98ae6fbaa8250d Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Fri, 9 Sep 2016 11:49:14 +0300 Subject: [PATCH 1/5] Use release repo for documentserver --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e56aa3b..5ed3023 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: onlyoffice-documentserver-data: container_name: onlyoffice-documentserver-data - image: onlyoffice/4testing-documentserver:latest + image: onlyoffice/documentserver:latest environment: - ONLYOFFICE_DATA_CONTAINER=true - POSTGRESQL_SERVER_HOST=onlyoffice-postgresql From 704bfff215f9570aae0798dbac8e9750b83fe44b Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Mon, 12 Sep 2016 14:09:25 +0300 Subject: [PATCH 2/5] set public docker image --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5ed3023..3a86dff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,7 @@ services: - /usr/share/fonts onlyoffice-documentserver: - image: onlyoffice/4testing-documentserver:latest + image: onlyoffice/documentserver:latest depends_on: - onlyoffice-documentserver-data - onlyoffice-postgresql From 00ed64fa7cffb571270dcd0720c115963ca97a10 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Mon, 12 Sep 2016 19:26:54 +0300 Subject: [PATCH 3/5] Update latest tag when build from next branch release develop hotfix --- Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5908900..7b7a65c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,21 @@ PACKAGE_VERSION := $(PRODUCT_VERSION)-$(BUILD_NUMBER) REPO_URL := "deb http://repo-doc-onlyoffice-com.s3.amazonaws.com/ubuntu/trusty/$(COMPANY_NAME)-$(PRODUCT_NAME)/$(GIT_BRANCH)/$(PACKAGE_VERSION)/ repo/" -ifeq ($(GIT_BRANCH), origin/develop) +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 From 9cac2cdf4281ae91556a38231968cec4e874a598 Mon Sep 17 00:00:00 2001 From: "Alexey.Golubev" Date: Mon, 12 Sep 2016 20:03:05 +0300 Subject: [PATCH 4/5] Fixed Makefile:7: *** missing separator. Stop. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7b7a65c..f8fd661 100644 --- a/Makefile +++ b/Makefile @@ -4,15 +4,15 @@ REPO_URL := "deb http://repo-doc-onlyoffice-com.s3.amazonaws.com/ubuntu/trusty/$ UPDATE_LATEST := false -ifneq(,$(findstring develop,$(GIT_BRANCH))) +ifneq (,$(findstring develop,$(GIT_BRANCH))) UPDATE_LATEST := true endif -ifneq(,$(findstring release,$(GIT_BRANCH))) +ifneq (,$(findstring release,$(GIT_BRANCH))) UPDATE_LATEST := true endif -ifneq(,$(findstring hotfix,$(GIT_BRANCH))) +ifneq (,$(findstring hotfix,$(GIT_BRANCH))) UPDATE_LATEST := true endif From 23107e65d0b1c7e04caf89a92955016991194976 Mon Sep 17 00:00:00 2001 From: Alexey Golubev Date: Tue, 13 Sep 2016 11:57:48 +0300 Subject: [PATCH 5/5] use cdn url --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 912c658..e50e912 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ ADD run-document-server.sh /app/onlyoffice/run-document-server.sh EXPOSE 80 443 -ARG REPO_URL="deb http://static.teamlab.com/repo/debian/ squeeze main" +ARG REPO_URL="deb http://download.onlyoffice.com/repo/debian squeeze main" ARG PRODUCT_NAME=onlyoffice-documentserver RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/onlyoffice.list && \