This commit is contained in:
Alexander Hofbauer 2021-02-23 21:34:42 +01:00
parent 4418f05958
commit f78cf9366c
No known key found for this signature in database
GPG key ID: 6421CE3D34E74BA1
2 changed files with 8 additions and 8 deletions

View file

@ -1,6 +1,6 @@
## Build stage ## Build stage
ARG product_version=6.1.0 ARG product_version=6.1.1
ARG build_number=83 ARG build_number=53
ARG oo_root='/var/www/onlyoffice/documentserver' ARG oo_root='/var/www/onlyoffice/documentserver'
FROM onlyoffice/documentserver:${product_version}.${build_number} as build-stage FROM onlyoffice/documentserver:${product_version}.${build_number} as build-stage

View file

@ -1,4 +1,4 @@
From cf7351495fd7cdb2ede5bfe4972adc1f0aa1465e Mon Sep 17 00:00:00 2001 From 34c308280edbb3011ce64e727f8cb522c5fd5ed7 Mon Sep 17 00:00:00 2001
From: Alexander Hofbauer <alex@derhofbauer.at> From: Alexander Hofbauer <alex@derhofbauer.at>
Date: Sun, 27 Dec 2020 21:49:37 +0100 Date: Sun, 27 Dec 2020 21:49:37 +0100
Subject: [PATCH] Patch for license Subject: [PATCH] Patch for license
@ -14,7 +14,7 @@ Subject: [PATCH] Patch for license
7 files changed, 15 insertions(+), 16 deletions(-) 7 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
index 694a13a..b2b2e9b 100644 index 694a13a..8d6d795 100644
--- a/Common/sources/commondefines.js --- a/Common/sources/commondefines.js
+++ b/Common/sources/commondefines.js +++ b/Common/sources/commondefines.js
@@ -975,8 +975,8 @@ const c_oAscUnlockRes = { @@ -975,8 +975,8 @@ const c_oAscUnlockRes = {
@ -23,8 +23,8 @@ index 694a13a..b2b2e9b 100644
-const buildVersion = '4.1.2'; -const buildVersion = '4.1.2';
-const buildNumber = 37; -const buildNumber = 37;
+const buildVersion = '6.1.0'; +const buildVersion = '6.1.1';
+const buildNumber = 83; +const buildNumber = 53;
exports.TaskQueueData = TaskQueueData; exports.TaskQueueData = TaskQueueData;
exports.CMailMergeSendData = CMailMergeSendData; exports.CMailMergeSendData = CMailMergeSendData;
@ -42,7 +42,7 @@ index 2b79e02..738df37 100644
exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000; exports.AVS_OFFICESTUDIO_FILE_UNKNOWN = 0x0000;
diff --git a/Common/sources/license.js b/Common/sources/license.js diff --git a/Common/sources/license.js b/Common/sources/license.js
index 19f0b61..30c31c4 100644 index 19f0b61..9076c94 100644
--- a/Common/sources/license.js --- a/Common/sources/license.js
+++ b/Common/sources/license.js +++ b/Common/sources/license.js
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
@ -50,7 +50,7 @@ index 19f0b61..30c31c4 100644
const constants = require('./constants'); const constants = require('./constants');
-const buildDate = '6/29/2016'; -const buildDate = '6/29/2016';
+const buildDate = '2021-01-28T11:37:00.000Z'; +const buildDate = '2021-01-29T10:10:00.000Z';
const oBuildDate = new Date(buildDate); const oBuildDate = new Date(buildDate);
exports.readLicense = function*() { exports.readLicense = function*() {