bobmaster/onlyoffice-ce-docker-license
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

7.1.0.215

Browse source
This commit is contained in:
Nelson DINIS GONCALVES 2022-05-17 15:22:05 +02:00
parent 78bc08a1a9
commit ad739c8041
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Dockerfile
View file

@ -1,5 +1,5 @@
ARG product_version=7.0.1 ARG product_version=7.1.0
ARG build_number=37 ARG build_number=215
ARG oo_root='/var/www/onlyoffice/documentserver' ARG oo_root='/var/www/onlyoffice/documentserver'
## Setup ## Setup
@ -37,8 +37,8 @@ FROM clone-stage as build-stage
# build server with license checks patched # build server with license checks patched
WORKDIR /build/server WORKDIR /build/server
RUN make RUN make
RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/FileConverter --targets=node10-linux -o /build/converter RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/FileConverter --targets=node14-linux -o /build/converter
RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/DocService --targets=node10-linux --options max_old_space_size=4096 -o /build/docservice RUN pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/DocService --targets=node14-linux --options max_old_space_size=4096 -o /build/docservice
## Final image ## Final image

22
server.patch
View file

@ -1,8 +1,8 @@
diff --git a/Common/sources/constants.js b/Common/sources/constants.js diff --git a/Common/sources/constants.js b/Common/sources/constants.js
index a6b553b..336d069 100644 index 0663ead..490582a 100644
--- a/Common/sources/constants.js --- a/Common/sources/constants.js
+++ b/Common/sources/constants.js +++ b/Common/sources/constants.js
@@ -74,7 +74,7 @@ exports.LICENSE_RESULT = { @@ -75,7 +75,7 @@ exports.LICENSE_RESULT = {
ExpiredLimited: 11 ExpiredLimited: 11
}; };
@ -12,10 +12,10 @@ index a6b553b..336d069 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 3f84ab7..06572af 100644 index c273afe..8786f62 100644
--- a/Common/sources/license.js --- a/Common/sources/license.js
+++ b/Common/sources/license.js +++ b/Common/sources/license.js
@@ -45,19 +45,19 @@ exports.readLicense = function*() { @@ -45,20 +45,20 @@ exports.readLicense = function*() {
count: 1, count: 1,
type: c_LR.Success, type: c_LR.Success,
light: false, light: false,
@ -36,7 +36,9 @@ index 3f84ab7..06572af 100644
+ plugins: true, + plugins: true,
buildDate: oBuildDate, buildDate: oBuildDate,
startDate: startDate, startDate: startDate,
- endDate: null - endDate: null,
- customerId: ""
+ customerId: "",
+ endDate: new Date("2099-01-01T23:59:59.000Z") + endDate: new Date("2099-01-01T23:59:59.000Z")
}, null]; }, null];
}; };
@ -44,10 +46,10 @@ index 3f84ab7..06572af 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 8e56486..161be23 100644 index b654c9c..31bdf2d 100644
--- a/DocService/sources/DocsCoServer.js --- a/DocService/sources/DocsCoServer.js
+++ b/DocService/sources/DocsCoServer.js +++ b/DocService/sources/DocsCoServer.js
@@ -166,7 +166,7 @@ let connections = []; // Активные соединения @@ -165,7 +165,7 @@ let connections = []; // Активные соединения
let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
let pubsub; let pubsub;
let queue; let queue;
@ -56,7 +58,7 @@ index 8e56486..161be23 100644
let licenseOriginal = null; let licenseOriginal = null;
let shutdownFlag = false; let shutdownFlag = false;
let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron); let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron);
@@ -3259,7 +3259,7 @@ exports.install = function(server, callbackFunction) { @@ -3328,7 +3328,7 @@ exports.install = function(server, callbackFunction) {
}); });
}; };
exports.setLicenseInfo = function(data, original ) { exports.setLicenseInfo = function(data, original ) {
@ -66,10 +68,10 @@ index 8e56486..161be23 100644
}; };
exports.getLicenseInfo = function() { exports.getLicenseInfo = function() {
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 b03e0d0..91e61c2 100644 index ccc232b..7c4e80d 100644
--- a/DocService/sources/server.js --- a/DocService/sources/server.js
+++ b/DocService/sources/server.js +++ b/DocService/sources/server.js
@@ -137,7 +137,6 @@ try { @@ -147,7 +147,6 @@ try {
} catch (e) { } catch (e) {
logger.warn('Failed to subscribe to plugin folder updates. When changing the list of plugins, you must restart the server. https://nodejs.org/docs/latest/api/fs.html#fs_availability'); logger.warn('Failed to subscribe to plugin folder updates. When changing the list of plugins, you must restart the server. https://nodejs.org/docs/latest/api/fs.html#fs_availability');
} }