jaffinio/onlyoffice-ce-docker-license
1
0
Fork 0
mirror of https://github.com/aleho/onlyoffice-ce-docker-license.git synced 2026-01-01 21:54:04 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: jaffinio:6.1.0.83
Branches Tags
jaffinio:main
jaffinio:6.3.1.32 jaffinio:6.3.0.111 jaffinio:6.2.2.21 jaffinio:6.2.1.24 jaffinio:6.2.0.123 jaffinio:6.1.1.53 jaffinio:6.1.0.83 jaffinio:6.0.1.32 jaffinio:6.0.0.105 jaffinio:5.6.4.20 jaffinio:5.6.3.2 jaffinio:5.6.2.2 jaffinio:5.6.0.17 jaffinio:5.5.3.39 jaffinio:5.5.1.76 jaffinio:5.5.0.165
...
compare: jaffinio:6.2.1.24
Branches Tags
jaffinio:main
jaffinio:6.3.1.32 jaffinio:6.3.0.111 jaffinio:6.2.2.21 jaffinio:6.2.1.24 jaffinio:6.2.0.123 jaffinio:6.1.1.53 jaffinio:6.1.0.83 jaffinio:6.0.1.32 jaffinio:6.0.0.105 jaffinio:5.6.4.20 jaffinio:5.6.3.2 jaffinio:5.6.2.2 jaffinio:5.6.0.17 jaffinio:5.5.3.39 jaffinio:5.5.1.76 jaffinio:5.5.0.165

3 Commits
6.1.0.83 ... 6.2.1.24

Author SHA1 Message Date
Alexander Hofbauer
08dfcb4fc0 6.2.1.24 2021-04-06 12:33:45 +02:00
Alexander Hofbauer
ce96de1d2b 6.2.0.123 2021-03-19 21:41:45 +01:00
Alexander Hofbauer
f78cf9366c 6.1.1.53 2021-02-23 21:34:42 +01:00
2 changed files with 13 additions and 13 deletions
Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,6 +1,6 @@
## Build stage ## Build stage
ARG product_version=6.1.0 ARG product_version=6.2.1
ARG build_number=83 ARG build_number=24
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

22
license.patch
View File

@@ -1,4 +1,4 @@
From cf7351495fd7cdb2ede5bfe4972adc1f0aa1465e Mon Sep 17 00:00:00 2001 From 4782f11ba230f0e75fd3784ddc1d24f763f0a689 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,17 +14,17 @@ 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 2a38911..d7d15b9 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 = { @@ -992,8 +992,8 @@ const c_oAscUnlockRes = {
Empty: 2 Empty: 2
}; };
-const buildVersion = '4.1.2'; -const buildVersion = '4.1.2';
-const buildNumber = 37; -const buildNumber = 37;
+const buildVersion = '6.1.0'; +const buildVersion = '6.2.1';
+const buildNumber = 83; +const buildNumber = 24;
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..0f18368 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-03-31T14:14:00.000Z';
const oBuildDate = new Date(buildDate); const oBuildDate = new Date(buildDate);
exports.readLicense = function*() { exports.readLicense = function*() {
@@ -80,7 +80,7 @@ index 19f0b61..30c31c4 100644
-exports.packageType = constants.PACKAGE_TYPE_OS; -exports.packageType = constants.PACKAGE_TYPE_OS;
+exports.packageType = constants.PACKAGE_TYPE_I; +exports.packageType = constants.PACKAGE_TYPE_I;
diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
index 471a271..5df4fe0 100644 index bd209ea..9151489 100644
--- a/DocService/sources/DocsCoServer.js --- a/DocService/sources/DocsCoServer.js
+++ b/DocService/sources/DocsCoServer.js +++ b/DocService/sources/DocsCoServer.js
@@ -103,6 +103,7 @@ const pubsubService = require('./pubsubRabbitMQ'); @@ -103,6 +103,7 @@ const pubsubService = require('./pubsubRabbitMQ');
@@ -100,7 +100,7 @@ index 471a271..5df4fe0 100644
let shutdownFlag = false; let shutdownFlag = false;
const MIN_SAVE_EXPIRATION = 60000; const MIN_SAVE_EXPIRATION = 60000;
@@ -2969,7 +2970,7 @@ exports.install = function(server, callbackFunction) { @@ -2976,7 +2977,7 @@ exports.install = function(server, callbackFunction) {
}); });
}; };
exports.setLicenseInfo = function(data) { exports.setLicenseInfo = function(data) {
@@ -110,7 +110,7 @@ index 471a271..5df4fe0 100644
exports.getLicenseInfo = function() { exports.getLicenseInfo = function() {
return licenseInfo; return licenseInfo;
diff --git a/DocService/sources/server.js b/DocService/sources/server.js diff --git a/DocService/sources/server.js b/DocService/sources/server.js
index db085bb..7d76d34 100644 index b623759..29574bd 100644
--- a/DocService/sources/server.js --- a/DocService/sources/server.js
+++ b/DocService/sources/server.js +++ b/DocService/sources/server.js
@@ -129,7 +129,6 @@ try { @@ -129,7 +129,6 @@ try {
@@ -147,5 +147,5 @@ index 40bf93e..1df9c10 100644
build-date: $(GRUNT_FILES) build-date: $(GRUNT_FILES)
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS) sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
-- --
2.29.2 2.30.2