From 73bd42b61b4cbad42d26b2701a93c7e002041dd5 Mon Sep 17 00:00:00 2001 From: Alexander Hofbauer Date: Tue, 6 Apr 2021 12:33:45 +0200 Subject: [PATCH] 6.2.1.24 --- Dockerfile | 4 ++-- license.patch | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 49a8946..6ca8b0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ## Build stage -ARG product_version=6.2.0 -ARG build_number=123 +ARG product_version=6.2.1 +ARG build_number=24 ARG oo_root='/var/www/onlyoffice/documentserver' FROM onlyoffice/documentserver:${product_version}.${build_number} as build-stage diff --git a/license.patch b/license.patch index 28e5e12..d558f80 100644 --- a/license.patch +++ b/license.patch @@ -1,4 +1,4 @@ -From 11b275653eb1961c7392aa1badd1a29a09bcfda0 Mon Sep 17 00:00:00 2001 +From 4782f11ba230f0e75fd3784ddc1d24f763f0a689 Mon Sep 17 00:00:00 2001 From: Alexander Hofbauer Date: Sun, 27 Dec 2020 21:49:37 +0100 Subject: [PATCH] Patch for license @@ -14,7 +14,7 @@ Subject: [PATCH] Patch for license 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js -index 2a38911..25b8608 100644 +index 2a38911..d7d15b9 100644 --- a/Common/sources/commondefines.js +++ b/Common/sources/commondefines.js @@ -992,8 +992,8 @@ const c_oAscUnlockRes = { @@ -23,8 +23,8 @@ index 2a38911..25b8608 100644 -const buildVersion = '4.1.2'; -const buildNumber = 37; -+const buildVersion = '6.2.0'; -+const buildNumber = 123; ++const buildVersion = '6.2.1'; ++const buildNumber = 24; exports.TaskQueueData = TaskQueueData; exports.CMailMergeSendData = CMailMergeSendData; @@ -42,7 +42,7 @@ index 2b79e02..738df37 100644 exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; diff --git a/Common/sources/license.js b/Common/sources/license.js -index 19f0b61..fb20c21 100644 +index 19f0b61..0f18368 100644 --- a/Common/sources/license.js +++ b/Common/sources/license.js @@ -34,7 +34,7 @@ @@ -50,7 +50,7 @@ index 19f0b61..fb20c21 100644 const constants = require('./constants'); -const buildDate = '6/29/2016'; -+const buildDate = '2021-03-01T12:10:00.000Z'; ++const buildDate = '2021-03-31T14:14:00.000Z'; const oBuildDate = new Date(buildDate); exports.readLicense = function*() {