From 428304bb4b828c4ce20494f6cfa7dab0c964b3eb Mon Sep 17 00:00:00 2001
From: hibobmaster <32976627+hibobmaster@users.noreply.github.com>
Date: Thu, 28 Sep 2023 20:38:47 +0800
Subject: [PATCH] 7.4.1.1

---
 Dockerfile               | 19 ++++++++++++++++++-
 onlyoffice-chinese-fonts |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 160000 onlyoffice-chinese-fonts

diff --git a/Dockerfile b/Dockerfile
index 4b92467..6291880 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG product_version=7.4.0
+ARG product_version=7.4.1
 ARG build_number=1
 ARG oo_root='/var/www/onlyoffice/documentserver'
 
@@ -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/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
+
+# 移除字体
+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"]
\ No newline at end of file
diff --git a/onlyoffice-chinese-fonts b/onlyoffice-chinese-fonts
new file mode 160000
index 0000000..6c31615
--- /dev/null
+++ b/onlyoffice-chinese-fonts
@@ -0,0 +1 @@
+Subproject commit 6c31615fe96cf1d379604dee365534e0b8ad8a96