Merge tag 'v4.1.2' into develop

v4.1.2

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 && \

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

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
@@ -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