Build x86_64 image

.github/workflows/docker-image.yml

@@ -21,5 +21,5 @@ jobs:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         repository: xbeeant/oo-unlimit
-        tags: latest, 7.3.3.50
+        tags: latest, 7.4.0.1
 

.gitmodules

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

Dockerfile

@@ -1,5 +1,5 @@
-ARG product_version=7.3.3
+ARG product_version=7.4.1
-ARG build_number=50
+ARG build_number=1
 ARG oo_root='/var/www/onlyoffice/documentserver'
 
 ## Setup
@@ -57,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_arm64/onlyoffice/documentserver/server/FileConverter --targets=node14-linux -o /build/converter
+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/DocService --targets=node14-linux --options max_old_space_size=4096 -o /build/docservice
+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
@@ -86,7 +86,7 @@ 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
+# 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
 

onlyoffice-chinese-fonts

@@ -1 +1 @@
-Subproject commit 6c31615fe96cf1d379604dee365534e0b8ad8a96
+Subproject commit 19ad64ae430e08945fd7007fc790be86a67f444d

server.patch

@@ -1,9 +1,9 @@
 diff --git a/Common/sources/constants.js b/Common/sources/constants.js
-index 65d4c6f..39a7e56 100644
+index 8ddfb47..d41c7e6 100644
 --- a/Common/sources/constants.js
 +++ b/Common/sources/constants.js
-@@ -83,7 +83,7 @@ exports.LICENSE_RESULT = {
+@@ -85,7 +85,7 @@ exports.LICENSE_RESULT = {
-   UsersViewCountOS: 15
+   NotBefore: 16
  };
  
 -exports.LICENSE_CONNECTIONS = 20;
@@ -12,7 +12,7 @@ index 65d4c6f..39a7e56 100644
  
  exports.AVS_OFFICESTUDIO_FILE_UNKNOWN =  0x0000;
 diff --git a/Common/sources/license.js b/Common/sources/license.js
-index 1b617c6..8fa7b53 100644
+index 5df8d69..3fd9de1 100644
 --- a/Common/sources/license.js
 +++ b/Common/sources/license.js
 @@ -45,24 +45,24 @@ exports.readLicense = function*() {
@@ -52,26 +52,28 @@ index 1b617c6..8fa7b53 100644
 -exports.packageType = constants.PACKAGE_TYPE_OS;
 +exports.packageType = constants.PACKAGE_TYPE_I;
 diff --git a/DocService/sources/server.js b/DocService/sources/server.js
-index 5c744f6..edfb423 100644
+index 6828adb..21374a6 100644
 --- a/DocService/sources/server.js
 +++ b/DocService/sources/server.js
-@@ -110,7 +110,6 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
+@@ -111,7 +111,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque
  
  if (!tenantManager.isMultitenantMode()) {
  	updateLicense();
 -	fs.watchFile(cfgLicenseFile, updateLicense);
++	// fs.watchFile(cfgLicenseFile, updateLicense);
  	setInterval(updateLicense, 86400000);
  }
  
 diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
-index 2a0b366..96468f9 100644
+index e83b71b..bc2ea58 100644
 --- a/FileConverter/sources/convertermaster.js
 +++ b/FileConverter/sources/convertermaster.js
-@@ -93,7 +93,6 @@ if (cluster.isMaster) {
+@@ -93,7 +93,7 @@ if (cluster.isMaster) {
    updateLicense();
  
    if (!tenantManager.isMultitenantMode()) {
 -    fs.watchFile(cfgLicenseFile, updateLicense);
++    // fs.watchFile(cfgLicenseFile, updateLicense);
      setInterval(updateLicense, 86400000);
    }
  } else {

web-apps.patch

@@ -1,14 +1,3 @@
-From 692bef4561ef9978c6b8663dd618211bf526b69f Mon Sep 17 00:00:00 2001
-From: Beeant <huangxb0512@gmail.com>
-Date: Sat, 24 Sep 2022 21:39:36 +0800
-Subject: [PATCH] build: license
-
----
- apps/documenteditor/mobile/src/lib/patch.jsx     | 2 +-
- apps/presentationeditor/mobile/src/lib/patch.jsx | 2 +-
- apps/spreadsheeteditor/mobile/src/lib/patch.jsx  | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
 diff --git a/apps/documenteditor/mobile/src/lib/patch.jsx b/apps/documenteditor/mobile/src/lib/patch.jsx
 index 963aca451..1ee48e856 100644
 --- a/apps/documenteditor/mobile/src/lib/patch.jsx
@@ -46,6 +35,3 @@ index ec7b37a2c..bfd879583 100644
 +EditorUIController.isSupportEditFeature = () => true;
  
  export default EditorUIController;
--- 
-2.31.1.windows.1
-