diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index ae85a4a..e886cb8 100644 --- a/.github/workflows/docker-image.yml +++ b/.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.4.0.1 + tags: latest, 7.3.3.50 diff --git a/Dockerfile b/Dockerfile index 6291880..f9c5e34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG product_version=7.4.1 -ARG build_number=1 +ARG product_version=7.3.3 +ARG build_number=50 ARG oo_root='/var/www/onlyoffice/documentserver' ## Setup @@ -77,20 +77,3 @@ 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 deleted file mode 160000 index 6c31615..0000000 --- a/onlyoffice-chinese-fonts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c31615fe96cf1d379604dee365534e0b8ad8a96 diff --git a/server.patch b/server.patch index 6945641..f217d02 100644 --- a/server.patch +++ b/server.patch @@ -1,9 +1,9 @@ diff --git a/Common/sources/constants.js b/Common/sources/constants.js -index 8ddfb47..d41c7e6 100644 +index 65d4c6f..39a7e56 100644 --- a/Common/sources/constants.js +++ b/Common/sources/constants.js -@@ -85,7 +85,7 @@ exports.LICENSE_RESULT = { - NotBefore: 16 +@@ -83,7 +83,7 @@ exports.LICENSE_RESULT = { + UsersViewCountOS: 15 }; -exports.LICENSE_CONNECTIONS = 20; @@ -12,7 +12,7 @@ index 8ddfb47..d41c7e6 100644 exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; diff --git a/Common/sources/license.js b/Common/sources/license.js -index 5df8d69..3fd9de1 100644 +index 1b617c6..8fa7b53 100644 --- a/Common/sources/license.js +++ b/Common/sources/license.js @@ -45,24 +45,24 @@ exports.readLicense = function*() { @@ -20,60 +20,58 @@ index 5df8d69..3fd9de1 100644 type: c_LR.Success, light: false, - packageType: constants.PACKAGE_TYPE_OS, -+ packageType: constants.PACKAGE_TYPE_I, ++ packageType: constants.PACKAGE_TYPE_I, mode: constants.LICENSE_MODE.None, - branding: false, -+ branding: true, ++ branding: true, connections: constants.LICENSE_CONNECTIONS, connectionsView: constants.LICENSE_CONNECTIONS, - customization: false, - advancedApi: false, - usersCount: 0, - usersViewCount: 0, -+ customization: true, -+ advancedApi: true, -+ usersCount: constants.LICENSE_CONNECTIONS, -+ usersViewCount: constants.LICENSE_CONNECTIONS, ++ customization: true, ++ advancedApi: true, ++ usersCount: constants.LICENSE_CONNECTIONS, ++ usersViewCount: constants.LICENSE_CONNECTIONS, usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, - hasLicense: false, - plugins: false, -+ hasLicense: true, -+ plugins: true, ++ hasLicense: true, ++ plugins: true, buildDate: oBuildDate, startDate: startDate, - endDate: null, -+ endDate: new Date("2099-01-01T23:59:59.000Z"), ++ endDate: new Date("2099-01-01T23:59:59.000Z"), customerId: "", - alias: "" -+ alias: "community" ++ alias: "community" }, null]; }; -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 6828adb..21374a6 100644 +index 5c744f6..edfb423 100644 --- a/DocService/sources/server.js +++ b/DocService/sources/server.js -@@ -111,7 +111,7 @@ if (!(cfgTokenEnableBrowser && cfgTokenEnableRequestInbox && cfgTokenEnableReque +@@ -110,7 +110,6 @@ 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 e83b71b..bc2ea58 100644 +index 2a0b366..96468f9 100644 --- a/FileConverter/sources/convertermaster.js +++ b/FileConverter/sources/convertermaster.js -@@ -93,7 +93,7 @@ if (cluster.isMaster) { +@@ -93,7 +93,6 @@ if (cluster.isMaster) { updateLicense(); if (!tenantManager.isMultitenantMode()) { - fs.watchFile(cfgLicenseFile, updateLicense); -+ // fs.watchFile(cfgLicenseFile, updateLicense); setInterval(updateLicense, 86400000); } } else { diff --git a/web-apps.patch b/web-apps.patch index bc69051..e657ef0 100644 --- a/web-apps.patch +++ b/web-apps.patch @@ -1,3 +1,14 @@ +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 @@ -35,3 +46,6 @@ index ec7b37a2c..bfd879583 100644 +EditorUIController.isSupportEditFeature = () => true; export default EditorUIController; +-- +2.31.1.windows.1 +