Compare commits

...

4 commits
7.4.x ... main

Author SHA1 Message Date
a1a239ad5e
build linux_arm64 2023-09-28 21:29:59 +08:00
0f37f9c94a
7.3.3.50 2023-09-28 20:37:07 +08:00
024637dbeb
revert backto v7.4.0.1 2023-09-28 20:29:00 +08:00
404b4e9f88
Update 7.4.1.1 2023-09-28 20:18:11 +08:00
3 changed files with 23 additions and 2 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "onlyoffice-chinese-fonts"]
path = onlyoffice-chinese-fonts
url = https://github.com/funggtopp/onlyoffice-chinese-fonts.git

View file

@ -57,8 +57,8 @@ FROM path-stage as build-stage
# build server with license checks patched # build server with license checks patched
WORKDIR /build/server WORKDIR /build/server
RUN make RUN make
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_arm64/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 RUN pkg /build/build_tools/out/linux_arm64/onlyoffice/documentserver/server/DocService --targets=node14-linux --options max_old_space_size=4096 -o /build/docservice
# build web-apps with mobile editing # build web-apps with mobile editing
WORKDIR /build/web-apps/build WORKDIR /build/web-apps/build
@ -77,3 +77,20 @@ COPY --from=build-stage /build/docservice ${oo_root}/server/DocService/docservic
COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/documenteditor/mobile ${oo_root}/web-apps/apps/documenteditor/mobile COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/documenteditor/mobile ${oo_root}/web-apps/apps/documenteditor/mobile
COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/presentationeditor/mobile ${oo_root}/web-apps/apps/presentationeditor/mobile COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/presentationeditor/mobile ${oo_root}/web-apps/apps/presentationeditor/mobile
COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/spreadsheeteditor/mobile ${oo_root}/web-apps/apps/spreadsheeteditor/mobile COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/spreadsheeteditor/mobile ${oo_root}/web-apps/apps/spreadsheeteditor/mobile
# 移除字体
RUN rm -rf /usr/share/fonts/truetype/dejavu
RUN rm -rf /usr/share/fonts/truetype/liberation
# 导入中文字体
ADD ["onlyoffice-chinese-fonts/fonts for oo6/*", "/usr/share/fonts/truetype/custom/"]
# 修正hightlight js引用问题
RUN sed -i "s/https:\/\/ajax.googleapis.com\/ajax\/libs\/jquery\/2.2.2\/jquery.min.js/vendor\/jQuery-2.2.2-min\/jquery-v2.2.2-min.js/" /var/www/onlyoffice/documentserver/sdkjs-plugins/highlightcode/index.html
EXPOSE 80 443
ARG COMPANY_NAME=onlyoffice
VOLUME /var/log/$COMPANY_NAME /var/lib/$COMPANY_NAME /var/www/$COMPANY_NAME/Data /var/lib/postgresql /var/lib/rabbitmq /var/lib/redis /usr/share/fonts/truetype/custom
ENTRYPOINT ["/app/ds/run-document-server.sh"]

@ -0,0 +1 @@
Subproject commit 6c31615fe96cf1d379604dee365534e0b8ad8a96