IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct the substitution of the Redis host and port

Browse Source
This commit is contained in:
Evgeniy Antonyuk 2023-08-28 18:10:23 +05:00
parent 1904e3bc43
commit f0e985703c
6 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/install/docker/.env
View File

@ -99,7 +99,6 @@
DOCEDITOR_HOST=${CONTAINER_PREFIX}doceditor
LOGIN_HOST=${CONTAINER_PREFIX}login
HELTHCHECKS_HOST=${CONTAINER_PREFIX}healthchecks
REDIS_HOST=${CONTAINER_PREFIX}redis
# proxy upstream environment #
SERVICE_API_SYSTEM=${API_SYSTEM_HOST}:${SERVICE_PORT}

4
build/install/docker/Dockerfile.app
View File

@ -162,7 +162,9 @@ RUN sed -i 's/127.0.0.1:5010/$service_api_system/' /etc/nginx/conf.d/onlyoffice.
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5033/$service_healthchecks/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/$public_root/\/var\/www\/public\//' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/http:\/\/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf
sed -i 's/http:\/\/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/\(redis_host =\).*/\1 "$server_redis"/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/\(redis_port =\).*/\1 $server_redis_port/' /etc/nginx/conf.d/onlyoffice.conf
ENTRYPOINT [ "/docker-entrypoint.sh" ]

12
build/install/docker/config/nginx/templates/upstream.conf.template
View File

@ -85,3 +85,15 @@ map "$DOCUMENT_SERVER_URL_EXTERNAL" "$document_server" {
default "$DOCUMENT_SERVER_URL_EXTERNAL";
"" "http://$DOCUMENT_CONTAINER_NAME";
}
map "$REDIS_HOST" "$server_redis" {
volatile;
default "$REDIS_HOST";
"" "$REDIS_CONTAINER_NAME";
}
map "$REDIS_PORT" "$server_redis_port" {
volatile;
default "$REDIS_PORT";
"" "6379";
}

3
build/install/docker/docspace.profiles.yml
View File

@ -271,6 +271,9 @@ services:
- SERVICE_HELTHCHECKS=${SERVICE_HELTHCHECKS}
- DOCUMENT_CONTAINER_NAME=${DOCUMENT_CONTAINER_NAME}
- DOCUMENT_SERVER_URL_EXTERNAL=${DOCUMENT_SERVER_URL_EXTERNAL}
- REDIS_CONTAINER_NAME=${REDIS_CONTAINER_NAME}
- REDIS_HOST=${REDIS_HOST}
- REDIS_PORT=${REDIS_PORT}
- SERVICE_PORT=${SERVICE_PORT}
volumes:
- proxy_log:/var/log/nginx

2
build/install/docker/docspace.yml
View File

@ -220,7 +220,9 @@ services:
- SERVICE_HELTHCHECKS=${SERVICE_HELTHCHECKS}
- DOCUMENT_CONTAINER_NAME=${DOCUMENT_CONTAINER_NAME}
- DOCUMENT_SERVER_URL_EXTERNAL=${DOCUMENT_SERVER_URL_EXTERNAL}
- REDIS_CONTAINER_NAME=${REDIS_CONTAINER_NAME}
- REDIS_HOST=${REDIS_HOST}
- REDIS_PORT=${REDIS_PORT}
- SERVICE_PORT=${SERVICE_PORT}
volumes:
- proxy_log:/var/log/nginx

1
build/install/docker/prepare-nginx-proxy.sh
View File

@ -2,4 +2,3 @@
REDIS_HOST=${REDIS_HOST:-"onlyoffice-redis"}
envsubst '$MAP_HASH_BUCKET_SIZE,$COUNT_WORKER_CONNECTIONS' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
sed -i "s!redis_host = \"127.0.0.1\"!redis_host = \"${REDIS_HOST}\"!g" /etc/nginx/conf.d/onlyoffice.conf