Upgrade !!! 8.2.2

downgrade without lock
2025-01-28 19:23:05 +01:00 · 2025-01-26 15:50:51 +01:00
9 changed files with 131 additions and 98 deletions
--- a/.env
+++ b/.env
@ -1,2 +1,2 @@
-product_version=8.2.1
+product_version=8.2.2
 build_number=1
--- a/62
+++ b/62
@ -1,4 +1,4 @@
-ARG product_version=8.2.1
+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=38
+ENV BUILD_NUMBER=22

 ARG build_deps="git make g++ nodejs bzip2"
 RUN apt-get update && \
@ -20,7 +22,11 @@ RUN apt-get update && \
    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
    apt-get update && \
    apt-get install -y ${build_deps} && \
-    npm install -g pkg grunt grunt-cli
+    npm install -g pkg grunt grunt-cli && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+RUN node -v
+RUN npm -v

 WORKDIR /build

@ -30,18 +36,12 @@ 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


-## Build
-FROM clone-stage as build-stage
-
-# build server with license checks patched
-WORKDIR /build/server
-
 # Patch Server
 COPY patches/server /build/server/patches
 # Needs a fake author to allow commits
@ -51,8 +51,16 @@ RUN git config --global user.email "contact@workstreams.ch" && \
    git am --ignore-whitespace patches/*.patch && \
    make

-RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/FileConverter --targets=node16-linux -o /build/converter
-RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/DocService --targets=node16-linux --options max_old_space_size=4096 -o /build/docservice
+
+## Build
+FROM clone-stage as build-stage
+
+# build server with license checks patched
+WORKDIR /build/server
+RUN make && \
+    pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/FileConverter --targets=node16-linux -o /build/converter && \
+    pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/DocService --targets=node16-linux --options max_old_space_size=4096 -o /build/docservice
+

 # build web-apps with mobile editing
 RUN cd /build/web-apps/build && npm install
@ -60,24 +68,24 @@ RUN cd /build/web-apps/build && npm install
 COPY patches/web-apps-mobile /build/web-apps-mobile

 RUN cd /build/web-apps/build && grunt --addon=web-apps-mobile
-#RUN cd /build/web-apps && \
-#git am --ignore-whitespace patches/*.patch && \
-#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
-#ARG DS_SUPERVISOR_CONF=/etc/supervisor/conf.d/ds.conf
+ARG oo_root
+ARG COMPANY_NAME=onlyoffice
+ARG PRODUCT_NAME=documentserver
+ARG DS_SUPERVISOR_CONF=/etc/supervisor/conf.d/ds.conf

 # Remove all documentserver-example data
-#RUN rm -rf /var/www/$COMPANY_NAME/$PRODUCT_NAME-example \
-#    && rm -rf /etc/$COMPANY_NAME/$PRODUCT_NAME-example \
-#    && rm -f $DS_SUPERVISOR_CONF \ 
-#    && rm -f /etc/nginx/includes/ds-example.conf \
-#    && ln -s /etc/$COMPANY_NAME/$PRODUCT_NAME/supervisor/ds.conf  $DS_SUPERVISOR_CONF 
+RUN rm -rf /var/www/$COMPANY_NAME/$PRODUCT_NAME-example \
+    && rm -rf /etc/$COMPANY_NAME/$PRODUCT_NAME-example \
+    && rm -f $DS_SUPERVISOR_CONF \ 
+    && rm -f /etc/nginx/includes/ds-example.conf \
+    && ln -s /etc/$COMPANY_NAME/$PRODUCT_NAME/supervisor/ds.conf  $DS_SUPERVISOR_CONF 

 # server
 COPY --from=build-stage --chown=ds:ds /build/converter  ${oo_root}/server/FileConverter/converter
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 01eb43ddf96ec601318eb96a6535aa0ea9b59f0c
+Subproject commit 4ff56c51ac078ab8177072c57846edae446a4c02
--- a/README.md
+++ b/README.md
@ -43,7 +43,7 @@ git format-patch -1 -o ../../patches/wed-apps/
 ### Step 3: Build Docker Image
 Update Dockerfile. You can get tags  <a href="https://hub.docker.com/r/onlyoffice/documentserver/tags">here</a> 
 ```
-ARG product_version=8.2
+ARG product_version=8.1.3
 ARG build_number=2
 ```
 Build docker image without tags
@ -55,7 +55,7 @@ docker build -t wsoffice .
 Or directly

 ```
-docker build --build-arg product_version=8.2 --build-arg build_number=2 -t wsoffice .
+docker build --build-arg product_version=8.1.3 --build-arg build_number=2 -t wsoffice .
 ```

 ### Step 4: Test and enjoy
--- a/1
+++ b/1
@ -0,0 +1 @@
+Subproject commit a60bc78e2328982c5e7a43dd9865a9df7a996439
--- a/local-production-linux.json
+++ b/local-production-linux.json
@ -2,7 +2,7 @@
    "services": {
        "CoAuthoring": {
            "server": {
-                "savetimeoutdelay": 15000
+                "savetimeoutdelay": 5000
            },
            "expire": {
                "sessionidle": "10h",
@ -12,8 +12,11 @@
                "enable": true,
                "interval": "1m"
            },
+            "lock": {
+                "enable": false
+            },
            "callbackBackoffOptions": {
-                "retries": 10,
+                "retries": 5,
                "timeout": {
                    "factor": 2,
                    "minTimeout": 5000,
--- a/patches/server/0001-Update-user-constant-and-license.patch
+++ b/patches/server/0001-Update-user-constant-and-license.patch
@ -1,7 +1,7 @@
-From c44eb4c80e24cfeb28c8938220060a41aeca1551 Mon Sep 17 00:00:00 2001
-From: WS-Bot <contact@workstreams.ch>
-Date: Mon, 14 Oct 2024 16:57:25 +0200
-Subject: [PATCH 1/3] Update user constent and license
+From 89906da95f777d1fd093dddeb39ea30821288723 Mon Sep 17 00:00:00 2001
+From: Fabrice <fabrice.roublot@workstreams.ch>
+Date: Tue, 28 Jan 2025 12:29:01 +0100
+Subject: [PATCH] fix licence on 8.2.2

 ---
 Common/sources/constants.js |  4 ++--
@ -10,55 +10,55 @@ Subject: [PATCH 1/3] Update user constent and license
 3 files changed, 11 insertions(+), 11 deletions(-)

 diff --git a/Common/sources/constants.js b/Common/sources/constants.js
-index 700696f..fa30891 100644
+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;
+   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 8813cba..37aba58 100644
+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];
- };
- 
+ 		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 e8e1308..23f7e2e 100644
+index e8e1308f..3967dacb 100644
 --- a/Makefile
 +++ b/Makefile
@@ -87,7 +87,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
@ -66,10 +66,10 @@ index e8e1308..23f7e2e 100644
 
 .NOTPARALLEL:
 -all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(DOCUMENT_TEMPLATES) $(LICENSE) $(WELCOME) $(INFO) build-date
-+all: $(SCHEMA) $(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.47.0
+2.30.2

--- a/patches/server/0002-Add-ms-package-dependency-to-FileConverter.patch
+++ b/patches/server/0002-Add-ms-package-dependency-to-FileConverter.patch
@ -1,15 +1,15 @@
-From 11da7405507e744086a739915d6b046f82b749b4 Mon Sep 17 00:00:00 2001
-From: WS-Bot <contact@workstreams.ch>
-Date: Mon, 14 Oct 2024 16:57:25 +0200
-Subject: [PATCH 2/3] Add 'ms' package dependency to FileConverter
+From 0ff69dc133ce522e75b1ab1cd12e6bb5b4729b70 Mon Sep 17 00:00:00 2001
+From: Fabrice <fabrice.roublot@workstreams.ch>
+Date: Tue, 28 Jan 2025 13:24:20 +0100
+Subject: [PATCH] fix ms on fileconverter

 ---
- FileConverter/npm-shrinkwrap.json | 5 +++++
- FileConverter/package.json        | 1 +
- 2 files changed, 6 insertions(+)
+ 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 e57a7f5..04afbc4 100644
+index e57a7f59..fe4b10ef 100644
 --- a/FileConverter/npm-shrinkwrap.json
 +++ b/FileConverter/npm-shrinkwrap.json
@@ -4,6 +4,11 @@
@ -24,8 +24,15 @@ index e57a7f5..04afbc4 100644
     "@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 6b6207b..3e2abd0 100644
+index 6b6207b1..a0ccb02b 100644
 --- a/FileConverter/package.json
 +++ b/FileConverter/package.json
@@ -5,6 +5,7 @@
@ -36,6 +43,13 @@ index 6b6207b..3e2abd0 100644
     "@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.47.0
+2.30.2

--- a/patches/server/0003-Fix-packaging-of-DocService.patch
+++ b/patches/server/0003-Fix-packaging-of-DocService.patch
@ -1,14 +1,14 @@
-From 51b7c7be0ce97803ba17c31e871534cbeb5fb56a Mon Sep 17 00:00:00 2001
-From: WS-Bot <contact@workstreams.ch>
-Date: Mon, 26 Aug 2024 14:20:32 +0200
-Subject: [PATCH 3/3] Fix packaging of DocService
+From 7d920561d4d435dd01604bc9326188205ff3ae36 Mon Sep 17 00:00:00 2001
+From: Fabrice <fabrice.roublot@workstreams.ch>
+Date: Tue, 28 Jan 2025 13:27:43 +0100
+Subject: [PATCH] fix package.js on server

 ---
- package.json | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ package.json | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/package.json b/package.json
-index 0050642..a08f856 100644
+index 00506422..f3f023a3 100644
 --- a/package.json
 +++ b/package.json
@@ -8,7 +8,7 @@
@ -29,6 +29,13 @@ index 0050642..a08f856 100644
     ],
     "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.47.0
+2.30.2
Author	SHA1	Message	Date
Fabrice Roublot	cf0ce3fe1b	Upgrade !!! 8.2.2 / create-package (push) Successful in 16m6s Details	2025-01-28 19:23:05 +01:00
Fabrice Roublot	0c616cbdcb	downgrade without lock / create-package (push) Successful in 16m29s Details	2025-01-26 15:50:51 +01:00
				`@ -0,0 +1 @@`
				`Subproject commit a60bc78e2328982c5e7a43dd9865a9df7a996439`