Merge branch hotfix/v5.6.0 into develop

This commit is contained in:
papacarlo 2020-07-28 13:48:30 +00:00
commit be27b2b4d6
6 changed files with 42 additions and 5 deletions

View file

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

View file

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

View file

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

View file

@ -49,6 +49,12 @@ JWT_SECRET=${JWT_SECRET:-secret}
JWT_HEADER=${JWT_HEADER:-Authorization} JWT_HEADER=${JWT_HEADER:-Authorization}
JWT_IN_BODY=${JWT_IN_BODY:-false} 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_DEFAULT_CONFIG=${CONF_DIR}/local.json
ONLYOFFICE_LOG4JS_CONFIG=${CONF_DIR}/log4js/production.json ONLYOFFICE_LOG4JS_CONFIG=${CONF_DIR}/log4js/production.json
ONLYOFFICE_EXAMPLE_CONFIG=${CONF_DIR}-example/local.json ONLYOFFICE_EXAMPLE_CONFIG=${CONF_DIR}-example/local.json
@ -461,7 +467,7 @@ if [ ${ONLYOFFICE_DATA_CONTAINER_HOST} = "localhost" ]; then
if [ ${REDIS_SERVER_HOST} != "localhost" ]; then if [ ${REDIS_SERVER_HOST} != "localhost" ]; then
update_redis_settings update_redis_settings
else elif [ ${REDIS_ENABLED} = "true" ]; then
# change rights for redis directory # change rights for redis directory
chown -R redis:redis ${REDIS_DATA} chown -R redis:redis ${REDIS_DATA}
chmod -R 750 ${REDIS_DATA} chmod -R 750 ${REDIS_DATA}
@ -492,7 +498,9 @@ fi
if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then if [ ${ONLYOFFICE_DATA_CONTAINER} != "true" ]; then
waiting_for_db waiting_for_db
waiting_for_amqp waiting_for_amqp
waiting_for_redis if [ ${REDIS_ENABLED} = "true" ]; then
waiting_for_redis
fi
update_nginx_settings update_nginx_settings

View file

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

12
tests/standalone.yml Normal file
View file

@ -0,0 +1,12 @@
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'