v5.5.3

* Remove docker .env file

* Add enviroment variables defaults

* Update docker-compose version

* Update travis tests variables

* Build document server image

* Fix mariadb

* Fix variable names

* Revert container name

.travis.yml

@@ -3,13 +3,6 @@ language: generic
 dist: trusty
 
 env:
-  # community edition
-  - config: standalone.yml
-
-  # integration edition
-  - config: standalone.yml
-    PRODUCT_NAME: documentserver-ie
-
   # certificates (default tls if onlyoffice not exists)
   - config: certs.yml
     ssl: true
@@ -59,13 +52,9 @@ env:
   # rabbitmq old variables
   - config: rabbitmq-old.yml
 
-  # redis with community edition
+  # redis
   - config: redis.yml
 
-  # redis with integraion edition
-  - config: redis.yml
-    PRODUCT_NAME: documentserver-ie
-
 services:
   - docker
 

Dockerfile

@@ -67,8 +67,7 @@ ARG REPO_URL="deb http://download.onlyoffice.com/repo/debian squeeze main"
 ARG COMPANY_NAME=onlyoffice
 ARG PRODUCT_NAME=documentserver
 
-ENV COMPANY_NAME=$COMPANY_NAME \
-    PRODUCT_NAME=$PRODUCT_NAME
+ENV COMPANY_NAME=$COMPANY_NAME
 
 RUN echo "$REPO_URL" | tee /etc/apt/sources.list.d/ds.list && \
     apt-get -y update && \

Makefile

@@ -61,10 +61,7 @@ clean-docker:
 	docker rmi -f $$(docker images -q $(COMPANY_NAME_LOW)/*) || exit 0
 
 deploy: $(DOCKER_TARGETS)
-	$(foreach TARGET,$(DOCKER_TARGETS), \
-		for i in {1..3}; do \
-			docker push $(subst $(COLON),:,$(TARGET)) && break || sleep 1m; \
-		done;)
+	$(foreach TARGET,$(DOCKER_TARGETS),docker push $(subst $(COLON),:,$(TARGET));)
 
 publish: $(DOCKER_ARCH)
 	aws s3 cp \

run-document-server.sh

@@ -49,12 +49,6 @@ JWT_SECRET=${JWT_SECRET:-secret}
 JWT_HEADER=${JWT_HEADER:-Authorization}
 JWT_IN_BODY=${JWT_IN_BODY:-false}
 
-if [[ ${PRODUCT_NAME} == "documentserver" ]]; then
-  REDIS_ENABLED=false
-else
-  REDIS_ENABLED=true
-fi
-
 ONLYOFFICE_DEFAULT_CONFIG=${CONF_DIR}/local.json
 ONLYOFFICE_LOG4JS_CONFIG=${CONF_DIR}/log4js/production.json
 ONLYOFFICE_EXAMPLE_CONFIG=${CONF_DIR}-example/local.json
@@ -465,16 +459,14 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then
     rm -rf /var/run/rabbitmq
   fi
 
-  if [ ${REDIS_ENABLED} = "true" ]; then
-    if [ ${REDIS_SERVER_HOST} != "localhost" ]; then
-      update_redis_settings
-    else
-      # change rights for redis directory
-      chown -R redis:redis ${REDIS_DATA}
-      chmod -R 750 ${REDIS_DATA}
+  if [ ${REDIS_SERVER_HOST} != "localhost" ]; then
+    update_redis_settings
+  else
+    # change rights for redis directory
+    chown -R redis:redis ${REDIS_DATA}
+    chmod -R 750 ${REDIS_DATA}
 
-      LOCAL_SERVICES+=("redis-server")
-    fi
+    LOCAL_SERVICES+=("redis-server")
   fi
 else
   # no need to update settings just wait for remote data
@@ -500,9 +492,7 @@ fi
 if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
   waiting_for_db
   waiting_for_amqp
-  if [ ${REDIS_ENABLED} = "true" ]; then
-    waiting_for_redis
-  fi
+  waiting_for_redis
 
   update_nginx_settings
 

tests/redis.yml

@@ -4,8 +4,6 @@ services:
     container_name: onlyoffice-documentserver
     build:
       context: ../.
-      args:
-        - PRODUCT_NAME=${PRODUCT_NAME:-documentserver}
     environment:
       - REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-onlyoffice-redis}
       - REDIS_SERVER_PORT=${REDIS_SERVER_PORT:-6379}

tests/standalone.yml

@@ -1,12 +0,0 @@
-version: '2.1'
-services:
-  onlyoffice-documentserver:
-    container_name: onlyoffice-documentserver
-    build:
-      context: ../.
-      args:
-        - PRODUCT_NAME=${PRODUCT_NAME:-documentserver}
-    stdin_open: true
-    restart: always
-    ports:
-      - '80:80'