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

Added nginx routing to Host client apps

Browse Source
This commit is contained in:
Alexey Safronov 2022-10-12 14:33:06 +03:00
parent 8b52d93fd3
commit 5cda2d314f
5 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/install/docker/.env.dev
View File

@ -1,3 +1,5 @@
LOCAL_IP=192.168.1.4
# docker-compose tags #
PRODUCT=onlyoffice
REPO=${PRODUCT}
@ -70,8 +72,6 @@
SSOAUTH_HOST=${CONTAINER_PREFIX}ssoauth
MIGRATION_RUNNER_HOST=${CONTAINER_PREFIX}migration-runner
PROXY_HOST=${CONTAINER_PREFIX}proxy
DOCEDITOR_HOST=${CONTAINER_PREFIX}doceditor
LOGIN_HOST=${CONTAINER_PREFIX}login
# proxy upstream environment #
SERVICE_API_SYSTEM=${API_SYSTEM_HOST}:${SERVICE_PORT}
@ -93,7 +93,8 @@
SERVICE_API=${API_HOST}:${SERVICE_PORT}
SERVICE_STUDIO=${STUDIO_HOST}:${SERVICE_PORT}
SERVICE_SSOAUTH=${SSOAUTH_HOST}:${SERVICE_PORT}
SERVICE_DOCEDITOR=${DOCEDITOR_HOST}:5013
SERVICE_LOGIN=${LOGIN_HOST}:5011
SERVICE_DOCEDITOR=${LOCAL_IP}:5013
SERVICE_LOGIN=${LOCAL_IP}:5011
SERVICE_CLIENT=${LOCAL_IP}:5001
NETWORK_NAME=${PRODUCT}

5
build/install/docker/Dockerfile.dev
View File

@ -161,8 +161,9 @@ RUN chown nginx:nginx /etc/nginx/* -R && \
#sed -i 's/127.0.0.1:5022/$service_mail/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:9999/$service_urlshortener/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5034/$service_migration/' /etc/nginx/conf.d/onlyoffice.conf && \
#sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
#sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5011/$service_login/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/127.0.0.1:5001/$service_client/' /etc/nginx/conf.d/onlyoffice.conf && \
sed -i 's/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf
## Doceditor ##

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

@ -10,6 +10,11 @@ map $SERVICE_DOCEDITOR $service_doceditor {
$SERVICE_DOCEDITOR $SERVICE_DOCEDITOR;
}
map $SERVICE_CLIENT $service_client {
volatile;
$SERVICE_CLIENT $SERVICE_CLIENT;
}
map $SERVICE_MIGRATION $service_migration {
volatile;
$SERVICE_MIGRATION $SERVICE_MIGRATION;

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

@ -173,6 +173,9 @@ services:
- SERVICE_API=${SERVICE_API}
- SERVICE_STUDIO=${SERVICE_STUDIO}
- SERVICE_SSOAUTH=${SERVICE_SSOAUTH}
- SERVICE_DOCEDITOR=${SERVICE_DOCEDITOR}
- SERVICE_LOGIN=${SERVICE_LOGIN}
- SERVICE_CLIENT=${SERVICE_CLIENT}
- DOCUMENT_SERVER=${DOCUMENT_SERVER_HOST}
- SERVICE_PORT=${SERVICE_PORT}
volumes:

1
build/run/macos/backend.docker.sh
View File

@ -13,4 +13,5 @@ docker_dir="$( pwd )"
echo "Docker directory:" $docker_dir
docker compose --env-file .env.dev -f build.dev.yml build
docker compose --env-file .env.dev -f docspace.dev.yml down -v
docker compose --env-file .env.dev -f migration-runner.yml -f docspace.dev.yml up -d