Merge branch 'release/v4.4.1'

Dockerfile

@@ -1,5 +1,5 @@
 FROM ubuntu:14.04
-MAINTAINER Ascensio System SIA <support@onlyoffice.com>
+LABEL maintainer Ascensio System SIA <support@onlyoffice.com>
 
 ENV LANG=en_US.UTF-8 LANGUAGE=en_US:en LC_ALL=en_US.UTF-8 DEBIAN_FRONTEND=noninteractive
 
@@ -12,7 +12,40 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
     curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
     apt-get -y update && \
     echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections && \
-    apt-get --force-yes -yq install software-properties-common adduser postgresql postgresql-client redis-server rabbitmq-server nginx-extras nodejs libstdc++6 libcurl3 libxml2 libboost-regex-dev zlib1g supervisor fonts-dejavu fonts-liberation ttf-mscorefonts-installer fonts-crosextra-carlito fonts-takao-gothic fonts-opensymbol libxss1 libgtkglext1 libcairo2 xvfb libxtst6 libgconf2-4 libasound2 bomstrip libnspr4 libnss3 libnss3-nssdb nano htop && \
+    apt-get --force-yes -yq install adduser \
+                                    bomstrip \
+                                    fonts-crosextra-carlito \
+                                    fonts-dejavu \
+                                    fonts-liberation \
+                                    fonts-opensymbol \
+                                    fonts-takao-gothic \
+                                    htop \
+                                    libasound2 \
+                                    libboost-regex-dev \
+                                    libcairo2 \
+                                    libcurl3 \
+                                    libgconf2-4 \
+                                    libgtkglext1 \
+                                    libnspr4 \
+                                    libnss3 \
+                                    libnss3-nssdb \
+                                    libstdc++6 \
+                                    libxml2 \
+                                    libxss1 \
+                                    libxtst6 \
+                                    nano \
+                                    nginx-extras \
+                                    nodejs \
+                                    postgresql \
+                                    postgresql-client \
+                                    pwgen \
+                                    rabbitmq-server \
+                                    redis-server \
+                                    software-properties-common \
+                                    supervisor \
+                                    ttf-mscorefonts-installer \
+                                    xvfb \
+                                    zlib1g && \
     sudo -u postgres psql -c "CREATE DATABASE onlyoffice;" && \
     sudo -u postgres psql -c "CREATE USER onlyoffice WITH password 'onlyoffice';" && \
     sudo -u postgres psql -c "GRANT ALL privileges ON DATABASE onlyoffice TO onlyoffice;" && \ 
@@ -23,8 +56,8 @@ RUN echo "#!/bin/sh\nexit 0" > /usr/sbin/policy-rc.d && \
     service nginx stop && \
     rm -rf /var/lib/apt/lists/*
 
-ADD config /app/onlyoffice/setup/config/
-ADD run-document-server.sh /app/onlyoffice/run-document-server.sh
+COPY config /app/onlyoffice/setup/config/
+COPY run-document-server.sh /app/onlyoffice/run-document-server.sh
 
 EXPOSE 80 443
 

Makefile

@@ -1,3 +1,9 @@
+COMPANY_NAME ?= onlyoffice
+GIT_BRANCH ?= origin/develop
+PRODUCT_NAME ?= documentserver-integration
+PRODUCT_VERSION ?= 0.0.0
+BUILD_NUMBER ?= 0
+
 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/"

run-document-server.sh

@@ -75,7 +75,6 @@ parse_rabbitmq_url(){
   else
     user=$userpass
   fi
-  echo $user
 
   # extract the host
   local hostport="$(echo ${url/$userpass@/} | cut -d/ -f1)"