From f9b3e30409da5e6ff95f11e3d7939e38f2306faf Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Wed, 3 May 2023 11:53:44 +0300 Subject: [PATCH] docker: fixed --- build/install/docker/Dockerfile.app | 2 +- build/install/docker/Dockerfile.dev | 2 +- build/install/docker/docker-entrypoint.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/install/docker/Dockerfile.app b/build/install/docker/Dockerfile.app index f326042cd4..ff07efeebf 100644 --- a/build/install/docker/Dockerfile.app +++ b/build/install/docker/Dockerfile.app @@ -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/ diff --git a/build/install/docker/Dockerfile.dev b/build/install/docker/Dockerfile.dev index 841f170d20..f415569541 100644 --- a/build/install/docker/Dockerfile.dev +++ b/build/install/docker/Dockerfile.dev @@ -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/ diff --git a/build/install/docker/docker-entrypoint.py b/build/install/docker/docker-entrypoint.py index 9577255cb7..5157808dca 100755 --- a/build/install/docker/docker-entrypoint.py +++ b/build/install/docker/docker-entrypoint.py @@ -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)