diff --git a/Dockerfile b/Dockerfile index c141de9..58df210 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,3 @@ -# build linux_arm64 ARG product_version=7.4.1 ARG build_number=1 ARG oo_root='/var/www/onlyoffice/documentserver' @@ -14,7 +13,7 @@ ENV BUILD_NUMBER=${build_number} ARG build_deps="git make g++ nodejs npm" RUN apt-get update && apt-get install -y ${build_deps} -#RUN npm config set registry https://registry.npm.taobao.org +# RUN npm config set registry https://registry.npm.taobao.org RUN npm install -g pkg grunt grunt-cli WORKDIR /build @@ -58,8 +57,8 @@ FROM path-stage as build-stage # build server with license checks patched WORKDIR /build/server RUN make -RUN pkg /build/build_tools/out/linux_/onlyoffice/documentserver/server/FileConverter --targets=node14-linux -o /build/converter -RUN pkg /build/build_tools/out/linux_/onlyoffice/documentserver/server/DocService --targets=node14-linux --options max_old_space_size=4096 -o /build/docservice +RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/FileConverter --targets=node14-linux -o /build/converter +RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/DocService --targets=node14-linux --options max_old_space_size=4096 -o /build/docservice # build web-apps with mobile editing WORKDIR /build/web-apps/build diff --git a/onlyoffice-chinese-fonts b/onlyoffice-chinese-fonts index 6c31615..19ad64a 160000 --- a/onlyoffice-chinese-fonts +++ b/onlyoffice-chinese-fonts @@ -1 +1 @@ -Subproject commit 6c31615fe96cf1d379604dee365534e0b8ad8a96 +Subproject commit 19ad64ae430e08945fd7007fc790be86a67f444d