From cf0ce3fe1b2e3eb1bebbf8df9a2ad2454b1b2d1b Mon Sep 17 00:00:00 2001 From: Fabrice Date: Tue, 28 Jan 2025 19:23:05 +0100 Subject: [PATCH] Upgrade !!! 8.2.2 --- .env | 4 +- Dockerfile | 24 +-- DocumentServer | 2 +- build_tools | 1 + local-production-linux.json | 2 +- .../server/0001-fix-licence-on-8.2.2.patch | 75 +++++++++ patches/server/0001-fix-licences.patch | 155 ------------------ .../server/0001-fix-ms-on-fileconverter.patch | 55 +++++++ .../0001-fix-package.js-on-server.patch | 41 +++++ patches/web-apps/0001-add-mobile.patch | 51 ------ 10 files changed, 190 insertions(+), 220 deletions(-) create mode 160000 build_tools create mode 100644 patches/server/0001-fix-licence-on-8.2.2.patch delete mode 100644 patches/server/0001-fix-licences.patch create mode 100644 patches/server/0001-fix-ms-on-fileconverter.patch create mode 100644 patches/server/0001-fix-package.js-on-server.patch delete mode 100644 patches/web-apps/0001-add-mobile.patch diff --git a/.env b/.env index b68c4fb..56ba3d7 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -product_version=8.1.3 -build_number=2 \ No newline at end of file +product_version=8.2.2 +build_number=1 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 9f4146e..bf6af53 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG product_version=8.1.3 +ARG product_version=8.2.2 ARG build_number=1 ARG oo_root='/var/www/onlyoffice/documentserver' @@ -8,8 +8,10 @@ ARG product_version ARG build_number ARG oo_root +# package version to get that value using the command inside a base onlyoffice/documentserver container +# dpkg -s onlyoffice-documentserver | grep '^Version:' | cut -d' ' -f2 | cut -d'-' -f2 ENV PRODUCT_VERSION=${product_version} -ENV BUILD_NUMBER=3 +ENV BUILD_NUMBER=22 ARG build_deps="git make g++ nodejs bzip2" RUN apt-get update && \ @@ -34,10 +36,10 @@ FROM setup-stage as clone-stage ARG tag=v${PRODUCT_VERSION}.${BUILD_NUMBER} RUN git config --global advice.detachedHead false && \ - git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/build_tools.git /build/build_tools && \ - git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/server.git /build/server && \ - git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/sdkjs.git /build/sdkjs && \ - git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/web-apps.git /build/web-apps + git clone --quiet --branch ${tag} --depth 1 https://github.com/ONLYOFFICE/build_tools.git /build/build_tools && \ + git clone --quiet --branch ${tag} --depth 1 https://github.com/ONLYOFFICE/server.git /build/server && \ + git clone --quiet --branch ${tag} --depth 1 https://github.com/ONLYOFFICE/sdkjs.git /build/sdkjs && \ + git clone --quiet --branch ${tag} --depth 1 https://github.com/ONLYOFFICE/web-apps.git /build/web-apps # Patch Server @@ -62,15 +64,17 @@ RUN make && \ # build web-apps with mobile editing RUN cd /build/web-apps/build && npm install -COPY patches/web-apps /build/web-apps/patches +#COPY patches/web-apps /build/web-apps/patches COPY patches/web-apps-mobile /build/web-apps-mobile -RUN cd /build/web-apps && \ - git am --ignore-whitespace patches/*.patch && \ - cd /build/web-apps/build && grunt --addon=web-apps-mobile +RUN cd /build/web-apps/build && grunt --addon=web-apps-mobile +#cd /build/web-apps && \ +# git am --ignore-whitespace patches/*.patch && \ + ## Final image FROM onlyoffice/documentserver:${product_version}.${build_number} + ARG oo_root ARG COMPANY_NAME=onlyoffice ARG PRODUCT_NAME=documentserver diff --git a/DocumentServer b/DocumentServer index 01eb43d..4ff56c5 160000 --- a/DocumentServer +++ b/DocumentServer @@ -1 +1 @@ -Subproject commit 01eb43ddf96ec601318eb96a6535aa0ea9b59f0c +Subproject commit 4ff56c51ac078ab8177072c57846edae446a4c02 diff --git a/build_tools b/build_tools new file mode 160000 index 0000000..a60bc78 --- /dev/null +++ b/build_tools @@ -0,0 +1 @@ +Subproject commit a60bc78e2328982c5e7a43dd9865a9df7a996439 diff --git a/local-production-linux.json b/local-production-linux.json index b723935..b1bec6b 100644 --- a/local-production-linux.json +++ b/local-production-linux.json @@ -2,7 +2,7 @@ "services": { "CoAuthoring": { "server": { - "savetimeoutdelay": 15000 + "savetimeoutdelay": 5000 }, "expire": { "sessionidle": "10h", diff --git a/patches/server/0001-fix-licence-on-8.2.2.patch b/patches/server/0001-fix-licence-on-8.2.2.patch new file mode 100644 index 0000000..efd7d8f --- /dev/null +++ b/patches/server/0001-fix-licence-on-8.2.2.patch @@ -0,0 +1,75 @@ +From 89906da95f777d1fd093dddeb39ea30821288723 Mon Sep 17 00:00:00 2001 +From: Fabrice +Date: Tue, 28 Jan 2025 12:29:01 +0100 +Subject: [PATCH] fix licence on 8.2.2 + +--- + Common/sources/constants.js | 4 ++-- + Common/sources/license.js | 16 ++++++++-------- + Makefile | 2 +- + 3 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/Common/sources/constants.js b/Common/sources/constants.js +index 700696ff..fa308911 100644 +--- a/Common/sources/constants.js ++++ b/Common/sources/constants.js +@@ -87,8 +87,8 @@ exports.LICENSE_RESULT = { + NotBefore: 16 + }; + +-exports.LICENSE_CONNECTIONS = 20; +-exports.LICENSE_USERS = 3; ++exports.LICENSE_CONNECTIONS = 9999; ++exports.LICENSE_USERS = 9999; + exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds + + exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; +diff --git a/Common/sources/license.js b/Common/sources/license.js +index 8813cbac..37aba586 100644 +--- a/Common/sources/license.js ++++ b/Common/sources/license.js +@@ -46,20 +46,20 @@ exports.readLicense = async function () { + type: c_LR.Success, + packageType: constants.PACKAGE_TYPE_OS, + mode: constants.LICENSE_MODE.None, +- branding: false, ++ 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, + usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, +- hasLicense: false, ++ hasLicense: true, + buildDate: oBuildDate, + startDate: startDate, +- endDate: null, ++ endDate: new Date("2099-01-01T23:59:59.000Z"), + customerId: "", +- alias: "" ++ alias: "community" + }, null]; + }; + +diff --git a/Makefile b/Makefile +index e8e1308f..3967dacb 100644 +--- a/Makefile ++++ b/Makefile +@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js + .PHONY: all clean install uninstall build-date + + .NOTPARALLEL: +-all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date +++all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date + + build-date: $(GRUNT_FILES) + sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS) +-- +2.30.2 + diff --git a/patches/server/0001-fix-licences.patch b/patches/server/0001-fix-licences.patch deleted file mode 100644 index e655b3b..0000000 --- a/patches/server/0001-fix-licences.patch +++ /dev/null @@ -1,155 +0,0 @@ -From fd17b0f68640cb90b81f516af52ab71e0242d410 Mon Sep 17 00:00:00 2001 -From: WS-Bot -Date: Mon, 14 Oct 2024 16:57:02 +0200 -Subject: [PATCH] fix licences - ---- - Common/sources/commondefines.js | 4 ++-- - Common/sources/constants.js | 6 +++--- - Common/sources/license.js | 20 ++++++++++---------- - FileConverter/package.json | 3 ++- - Makefile | 3 ++- - package.json | 6 +++--- - 6 files changed, 22 insertions(+), 20 deletions(-) - -diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js -index fc8756b9..c1a9a7ff 100644 ---- a/Common/sources/commondefines.js -+++ b/Common/sources/commondefines.js -@@ -1173,8 +1173,8 @@ const FileStatus = { - NeedPassword: 9 - }; - --const buildVersion = '4.1.2'; --const buildNumber = 37; -+const buildVersion = '8.1.3'; -+const buildNumber = 2; - - exports.TaskQueueData = TaskQueueData; - exports.CMailMergeSendData = CMailMergeSendData; -diff --git a/Common/sources/constants.js b/Common/sources/constants.js -index ffaabaf7..003aa099 100644 ---- a/Common/sources/constants.js -+++ b/Common/sources/constants.js -@@ -87,9 +87,9 @@ exports.LICENSE_RESULT = { - NotBefore: 16 - }; - --exports.LICENSE_CONNECTIONS = 20; --exports.LICENSE_USERS = 3; --exports.LICENSE_EXPIRE_USERS_ONE_DAY = 24 * 60 * 60; // day in seconds -+exports.LICENSE_CONNECTIONS = 999999; -+exports.LICENSE_USERS = 999999; -+exports.LICENSE_EXPIRE_USERS_ONE_DAY = new Date("2999-01-01T23:59:59.000Z").getTime() / 1000; // day in seconds - - exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; - exports.AVS_OFFICESTUDIO_FILE_DOCUMENT = 0x0040; -diff --git a/Common/sources/license.js b/Common/sources/license.js -index 5df8d693..2764be54 100644 ---- a/Common/sources/license.js -+++ b/Common/sources/license.js -@@ -34,7 +34,7 @@ - - const constants = require('./constants'); - --const buildDate = '6/29/2016'; -+const buildDate = '2024-08-27T14:34:00.000Z'; - const oBuildDate = new Date(buildDate); - - exports.readLicense = function*() { -@@ -47,21 +47,21 @@ exports.readLicense = function*() { - light: false, - packageType: constants.PACKAGE_TYPE_OS, - mode: constants.LICENSE_MODE.None, -- branding: false, -+ 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, - usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY, -- hasLicense: false, -- plugins: false, -+ hasLicense: true, -+ plugins: true, - buildDate: oBuildDate, - startDate: startDate, -- endDate: null, -+ endDate: new Date("2099-01-01T23:59:59.000Z"), - customerId: "", -- alias: "" -+ alias: "community" - }, null]; - }; - -diff --git a/FileConverter/package.json b/FileConverter/package.json -index 6b6207b1..a0ccb02b 100644 ---- a/FileConverter/package.json -+++ b/FileConverter/package.json -@@ -5,6 +5,7 @@ - "private": true, - "bin": "sources/convertermaster.js", - "dependencies": { -+ "ms": "2.1.1", - "@expo/spawn-async": "1.3.0", - "bytes": "3.0.0", - "co": "4.6.0", -@@ -19,4 +20,4 @@ - "../DocService/sources/editorDataRedis.js" - ] - } --} -+} -\ No newline at end of file -diff --git a/Makefile b/Makefile -index e8e1308f..0d63a03b 100644 ---- a/Makefile -+++ b/Makefile -@@ -87,7 +87,8 @@ DEBUG = $(BRANDING_DIR)/debug.js - .PHONY: all clean install uninstall build-date - - .NOTPARALLEL: --all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date -+#all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date -+all: $(SCHEMA) $(LICENSE) $(WELCOME) $(INFO) build-date - - build-date: $(GRUNT_FILES) - sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS) -diff --git a/package.json b/package.json -index 78c3c50d..36593a55 100644 ---- a/package.json -+++ b/package.json -@@ -8,7 +8,7 @@ - "server": { - "expand": true, - "src": [ -- "./**/sources/*.js", -+ "./**/sources/**/*.js", - "./Common/package.json", - "./DocService/package.json", - "./DocService/public/healthcheck.docx", -@@ -43,7 +43,7 @@ - }, - "postprocess": { - "src": [ -- "./build/server/**/sources/*.js" -+ "./build/server/**/sources/**/*.js" - ], - "dest": "./" - }, -@@ -82,4 +82,4 @@ - "install:Metrics": "npm ci --prefix ./Metrics", - "build": "run-p install:*" - } --} -+} -\ No newline at end of file --- -2.30.2 - diff --git a/patches/server/0001-fix-ms-on-fileconverter.patch b/patches/server/0001-fix-ms-on-fileconverter.patch new file mode 100644 index 0000000..5c6855e --- /dev/null +++ b/patches/server/0001-fix-ms-on-fileconverter.patch @@ -0,0 +1,55 @@ +From 0ff69dc133ce522e75b1ab1cd12e6bb5b4729b70 Mon Sep 17 00:00:00 2001 +From: Fabrice +Date: Tue, 28 Jan 2025 13:24:20 +0100 +Subject: [PATCH] fix ms on fileconverter + +--- + FileConverter/npm-shrinkwrap.json | 7 ++++++- + FileConverter/package.json | 3 ++- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/FileConverter/npm-shrinkwrap.json b/FileConverter/npm-shrinkwrap.json +index e57a7f59..fe4b10ef 100644 +--- a/FileConverter/npm-shrinkwrap.json ++++ b/FileConverter/npm-shrinkwrap.json +@@ -4,6 +4,11 @@ + "lockfileVersion": 1, + "requires": true, + "dependencies": { ++ "ms": { ++ "version": "2.1.1", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", ++ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" ++ }, + "@expo/spawn-async": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@expo/spawn-async/-/spawn-async-1.3.0.tgz", +@@ -112,4 +117,4 @@ + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + } + } +-} ++} +\ No newline at end of file +diff --git a/FileConverter/package.json b/FileConverter/package.json +index 6b6207b1..a0ccb02b 100644 +--- a/FileConverter/package.json ++++ b/FileConverter/package.json +@@ -5,6 +5,7 @@ + "private": true, + "bin": "sources/convertermaster.js", + "dependencies": { ++ "ms": "2.1.1", + "@expo/spawn-async": "1.3.0", + "bytes": "3.0.0", + "co": "4.6.0", +@@ -19,4 +20,4 @@ + "../DocService/sources/editorDataRedis.js" + ] + } +-} ++} +\ No newline at end of file +-- +2.30.2 + diff --git a/patches/server/0001-fix-package.js-on-server.patch b/patches/server/0001-fix-package.js-on-server.patch new file mode 100644 index 0000000..f38b035 --- /dev/null +++ b/patches/server/0001-fix-package.js-on-server.patch @@ -0,0 +1,41 @@ +From 7d920561d4d435dd01604bc9326188205ff3ae36 Mon Sep 17 00:00:00 2001 +From: Fabrice +Date: Tue, 28 Jan 2025 13:27:43 +0100 +Subject: [PATCH] fix package.js on server + +--- + package.json | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/package.json b/package.json +index 00506422..f3f023a3 100644 +--- a/package.json ++++ b/package.json +@@ -8,7 +8,7 @@ + "server": { + "expand": true, + "src": [ +- "./**/sources/*.js", ++ "./**/sources/**/*.js", + "./Common/package.json", + "./DocService/package.json", + "./DocService/public/healthcheck.docx", +@@ -43,7 +43,7 @@ + }, + "postprocess": { + "src": [ +- "./build/server/**/sources/*.js" ++ "./build/server/**/sources/**/*.js" + ], + "dest": "./" + }, +@@ -96,4 +96,4 @@ + "3d-party-lic-report": "run-s 3d-party-lic-md-header 3d-party-lic-report:*", + "build": "run-p install:*" + } +-} ++} +\ No newline at end of file +-- +2.30.2 + diff --git a/patches/web-apps/0001-add-mobile.patch b/patches/web-apps/0001-add-mobile.patch deleted file mode 100644 index 19bec2d..0000000 --- a/patches/web-apps/0001-add-mobile.patch +++ /dev/null @@ -1,51 +0,0 @@ -From de497cfe4ac6a6cdb522bb7463624c91d282b721 Mon Sep 17 00:00:00 2001 -From: WS-Bot -Date: Mon, 14 Oct 2024 16:57:25 +0200 -Subject: [PATCH] add mobile - ---- - 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 963aca451c..1ee48e8568 100644 ---- a/apps/documenteditor/mobile/src/lib/patch.jsx -+++ b/apps/documenteditor/mobile/src/lib/patch.jsx -@@ -4,7 +4,7 @@ const EditorUIController = () => { - }; - - EditorUIController.isSupportEditFeature = () => { -- return false -+ return true - }; - - EditorUIController.getToolbarOptions = () => { -diff --git a/apps/presentationeditor/mobile/src/lib/patch.jsx b/apps/presentationeditor/mobile/src/lib/patch.jsx -index ec7b37a2ce..bfd8795839 100644 ---- a/apps/presentationeditor/mobile/src/lib/patch.jsx -+++ b/apps/presentationeditor/mobile/src/lib/patch.jsx -@@ -1,6 +1,6 @@ - - const EditorUIController = () => null; - --EditorUIController.isSupportEditFeature = () => false; -+EditorUIController.isSupportEditFeature = () => true; - - export default EditorUIController; -diff --git a/apps/spreadsheeteditor/mobile/src/lib/patch.jsx b/apps/spreadsheeteditor/mobile/src/lib/patch.jsx -index ec7b37a2ce..bfd8795839 100644 ---- a/apps/spreadsheeteditor/mobile/src/lib/patch.jsx -+++ b/apps/spreadsheeteditor/mobile/src/lib/patch.jsx -@@ -1,6 +1,6 @@ - - const EditorUIController = () => null; - --EditorUIController.isSupportEditFeature = () => false; -+EditorUIController.isSupportEditFeature = () => true; - - export default EditorUIController; --- -2.30.2 -