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

docker: fixed

Browse Source
This commit is contained in:
Alexey Bannov 2023-05-03 11:53:44 +03:00
parent f1fba8a19a
commit f9b3e30409
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ RUN mkdir -p /var/log/onlyoffice && \
curl \
vim \
python3-pip && \
pip3 install --upgrade jsonpath-ng multipledispatch && \
pip3 install --upgrade jsonpath-ng multipledispatch netaddr netifaces && \
rm -rf /var/lib/apt/lists/*
COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onlyoffice/config/

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

@ -112,7 +112,7 @@ RUN mkdir -p /var/log/onlyoffice && \
curl \
vim \
python3-pip && \
pip3 install --upgrade jsonpath-ng multipledispatch && \
pip3 install --upgrade jsonpath-ng multipledispatch netaddr netifaces && \
rm -rf /var/lib/apt/lists/*
COPY --from=base --chown=onlyoffice:onlyoffice /app/onlyoffice/config/* /app/onlyoffice/config/

6
build/install/docker/docker-entrypoint.py
View File

@ -146,13 +146,13 @@ updateJsonData(jsonData,"$.files.docservice.url.internal", DOCUMENT_SERVER_URL_I
updateJsonData(jsonData,"$.files.docservice.secret.value", DOCUMENT_SERVER_JWT_SECRET)
updateJsonData(jsonData,"$.files.docservice.secret.header", DOCUMENT_SERVER_JWT_HEADER)
netmask = netifaces.ifaddresses('eth0').get(netifaces.AF_INET)[0].get('addr')
ip_address = netifaces.ifaddresses('eth0').get(netifaces.AF_INET)[0].get('netmask')
ip_address = netifaces.ifaddresses('eth0').get(netifaces.AF_INET)[0].get('addr')
netmask = netifaces.ifaddresses('eth0').get(netifaces.AF_INET)[0].get('netmask')
ip_address_netmask = '%s/%s' % (ip_address, netmask)
interface_cidr = IPNetwork(ip_address_netmask)
knownNetwork = str(interface_cidr)
updateJsonData(jsonData,"$.core.hosting.forwardedHeadersOptions.knownNetworks", "[" + knownNetwork + "]")
updateJsonData(jsonData,"$.core.hosting.forwardedHeadersOptions.knownNetworks", [knownNetwork])
writeJsonFile(filePath, jsonData)