6.1.1.53

Fixes #9

Dockerfile

@@ -1,45 +1,66 @@
-ARG oo_version=5.5.3.39
+## Build stage
-FROM onlyoffice/documentserver:$oo_version
+ARG product_version=6.1.1
-ARG oo_version=5.5.3.39
+ARG build_number=53
+ARG oo_root='/var/www/onlyoffice/documentserver'
+
+FROM onlyoffice/documentserver:${product_version}.${build_number} as build-stage
+ARG product_version
+ARG build_number
+ARG oo_root
+
+ENV PRODUCT_VERSION=${product_version}
+ENV BUILD_NUMBER=${build_number}
+
+# Mobile apps patching
+ARG me_search='isSupportEditFeature:function(){return!1}'
+ARG me_patch='s/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g'
+
+RUN grep -q "${me_search}" ${oo_root}/web-apps/apps/documenteditor/mobile/app.js \
+  && sed -si "${me_patch}" ${oo_root}/web-apps/apps/documenteditor/mobile/app.js
+
+RUN grep -q "${me_search}" ${oo_root}/web-apps/apps/presentationeditor/mobile/app.js \
+  && sed -si "${me_patch}" ${oo_root}/web-apps/apps/presentationeditor/mobile/app.js
+
+RUN grep -q "${me_search}" ${oo_root}/web-apps/apps/spreadsheeteditor/mobile/app.js \
+  && sed -si "${me_patch}" ${oo_root}/web-apps/apps/spreadsheeteditor/mobile/app.js
 
 
-RUN sed -is \
+# Rebuild with license checks replaced
-    's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
+ARG build_deps="git make g++ nodejs npm"
-    /var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/mobile/app.js
+RUN apt-get update && apt-get install -y ${build_deps}
 
-RUN sed -is \
+ARG tag=v${product_version}.${build_number}
-    's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
+RUN  mkdir /build \
-    /var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/mobile/app.js
+  && 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
-RUN sed -is \
-    's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
-    /var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/mobile/app.js
 
 
-# source patching and compilation
+WORKDIR /build/server
-RUN apt-get update && apt-get install -y \
-        git \
-        curl \
-    && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-    && apt install -y nodejs \
-    && rm -rf /var/lib/apt/lists/*
 
-
+RUN npm install -g pkg grunt grunt-cli
-RUN mkdir /build
-WORKDIR /build
-
-RUN git clone --branch v$oo_version --depth 1 https://github.com/ONLYOFFICE/server.git .
 
 COPY license.patch /build/
-RUN git apply license.patch
+RUN git apply /build/license.patch
+
+RUN make \
+  && pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/FileConverter --targets=node10-linux -o /build/converter \
+  && pkg /build/build_tools/out/linux_64/onlyoffice/documentserver/server/DocService --targets=node10-linux --options max_old_space_size=4096 -o /build/docservice \
+  && cp /build/converter ${oo_root}/server/FileConverter/converter \
+  && cp /build/docservice ${oo_root}/server/DocService/docservice
 
 
-RUN npm install pkg grunt-cli \
+## Prod image
-    && make \
+FROM onlyoffice/documentserver:${product_version}.${build_number}
-    && node_modules/.bin/pkg --targets=linux build/server/FileConverter \
+ARG oo_root
-    && node_modules/.bin/pkg --targets=linux build/server/DocService \
-    && cp fileconverter /var/www/onlyoffice/documentserver/server/FileConverter/converter \
-    && cp coauthoring /var/www/onlyoffice/documentserver/server/DocService/docservice
 
-WORKDIR /
+COPY --from=build-stage ${oo_root}/web-apps/apps/documenteditor/mobile/app.js \
-RUN rm -rf /build
+                        ${oo_root}/web-apps/apps/documenteditor/mobile/app.js
+COPY --from=build-stage ${oo_root}/web-apps/apps/presentationeditor/mobile/app.js \
+                        ${oo_root}/web-apps/apps/presentationeditor/mobile/app.js
+COPY --from=build-stage ${oo_root}/web-apps/apps/spreadsheeteditor/mobile/app.js \
+                        ${oo_root}/web-apps/apps/spreadsheeteditor/mobile/app.js
+
+COPY --from=build-stage ${oo_root}/server/FileConverter/converter \
+                        ${oo_root}/server/FileConverter/converter
+COPY --from=build-stage ${oo_root}/server/DocService/docservice \
+                        ${oo_root}/server/DocService/docservice

README.md

@@ -1,8 +1,51 @@
 # OnlyOffice Community server with license
 
+
 ## Usage
 
-### CLI
+### Podman CLI
+
+```sh
+podman run \
+    --name=onlyoffice \
+    --detach \
+    --publish=80:80 \
+    docker.io/alehoho/oo-ce-docker-license
+```
+
+### Docker CLI
+
+```sh
+docker run \
+    --name=onlyoffice \
+    --detach \
+    --publish=80:80 \
+    alehoho/oo-ce-docker-license
+```
+
+### docker-compose.yml
+
+```yml
+services:
+  onlyoffice:
+    container_name: onlyoffice
+    image: alehoho/oo-ce-docker-license
+    ports:
+      - "80"
+```
+
+
+## Build
+
+### Buildah CLI
+
+```sh
+buildah build-using-dockerfile \
+    --tag=onlyoffice-patched \
+    https://github.com/aleho/onlyoffice-ce-docker-license.git
+```
+
+### Docker CLI
 
 ```sh
 docker build \
@@ -10,12 +53,6 @@ docker build \
     https://github.com/aleho/onlyoffice-ce-docker-license.git
 ```
 
-```sh
-docker run \
-    --name=onlyoffice \
-    --detach \
-    onlyoffice-patched
-```
 
 ### docker-compose.yml
 
@@ -26,8 +63,16 @@ services:
     image: onlyoffice-patched
     build:
       context: https://github.com/aleho/onlyoffice-ce-docker-license.git
+    …
 ```
 
+### Verify
+
+To verify that the container is running successfully open
+`[server-url]/healthcheck` (has to return `true`) and for the version number open
+`[server-url]/web-apps/apps/api/documents/api.js` and check the header comment.
+
+
 ## Background
 Recently, just about a month after Nextcloud announced their partnership with
 Ascensio and featuring a community version of OnlyOffice, the latter decided
@@ -39,7 +84,7 @@ feature. Only after some outcries Ascensio deigned to release a statement and
 a new, albeit "limited", offer of €90 for home servers.
 
 In my opinion these deceptive practices are unacceptable for a company
-advertising itself and their product as open source .
+advertising itself and their product as open source.
 
 
 ## Thanks

license.patch

@@ -1,128 +1,151 @@
-From 77edf2dd0cc894aefca49927c292defbccf7365b Mon Sep 17 00:00:00 2001
+From 34c308280edbb3011ce64e727f8cb522c5fd5ed7 Mon Sep 17 00:00:00 2001
 From: Alexander Hofbauer <alex@derhofbauer.at>
-Date: Sun, 19 Apr 2020 12:52:29 +0200
+Date: Sun, 27 Dec 2020 21:49:37 +0100
-Subject: [PATCH] Enable rebuild with fake license
+Subject: [PATCH] Patch for license
 
 ---
- Common/sources/commondefines.js |  5 ++--
+ Common/sources/commondefines.js          |  4 ++--
- Common/sources/license.js       | 52 ++++++++-------------------------
+ Common/sources/constants.js              |  2 +-
- Makefile                        |  6 ++--
+ Common/sources/license.js                | 16 ++++++++--------
- 3 files changed, 18 insertions(+), 45 deletions(-)
+ DocService/sources/DocsCoServer.js       |  5 +++--
+ DocService/sources/server.js             |  1 -
+ FileConverter/sources/convertermaster.js |  1 -
+ Makefile                                 |  2 +-
+ 7 files changed, 15 insertions(+), 16 deletions(-)
 
 diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
-index 4518ac8..ff00ffe 100644
+index 694a13a..8d6d795 100644
 --- a/Common/sources/commondefines.js
 +++ b/Common/sources/commondefines.js
-@@ -970,8 +970,9 @@ const c_oAscQueueType = {
+@@ -975,8 +975,8 @@ const c_oAscUnlockRes = {
-   activemq: 'activemq'
+   Empty: 2
  };
  
 -const buildVersion = '4.1.2';
 -const buildNumber = 37;
-+const buildVersion = '5.5.3';
++const buildVersion = '6.1.1';
-+const buildNumber = 76;
++const buildNumber = 53;
-+exports.buildDate = '2020-03-36T14:02:15.000Z';
  
  exports.TaskQueueData = TaskQueueData;
  exports.CMailMergeSendData = CMailMergeSendData;
+diff --git a/Common/sources/constants.js b/Common/sources/constants.js
+index 2b79e02..738df37 100644
+--- a/Common/sources/constants.js
++++ b/Common/sources/constants.js
+@@ -70,7 +70,7 @@ exports.LICENSE_RESULT = {
+   ExpiredLimited: 11
+ };
+ 
+-exports.LICENSE_CONNECTIONS = 20;
++exports.LICENSE_CONNECTIONS = 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 290d85d..5a1ab21 100644
+index 19f0b61..9076c94 100644
 --- a/Common/sources/license.js
 +++ b/Common/sources/license.js
-@@ -32,53 +32,25 @@
+@@ -34,7 +34,7 @@
  
- 'use strict';
- 
--const config = require('config');
--const configL = config.get('license');
  const constants = require('./constants');
--const logger = require('./logger');
+ 
--const editorDataStorage = require('./../../DocService/sources/' + config.get('services.CoAuthoring.server.editorDataStorage'));
--
 -const buildDate = '6/29/2016';
--const oBuildDate = new Date(buildDate);
++const buildDate = '2021-01-29T10:10:00.000Z';
--const oPackageType = configL.get('packageType');
+ const oBuildDate = new Date(buildDate);
--
--const cfgRedisPrefix = config.get('services.CoAuthoring.redis.prefix');
--const redisKeyLicense = cfgRedisPrefix + constants.REDIS_KEY_LICENSE;
--
--let editorData = new editorDataStorage();
-+const commonDefines = require('./commondefines');
  
  exports.readLicense = function*() {
--	const c_LR = constants.LICENSE_RESULT;
+@@ -43,17 +43,17 @@ exports.readLicense = function*() {
--	const res = {
-+	return {
  		count: 1,
--		type: c_LR.Error,
+ 		type: c_LR.Success,
-+		type: constants.LICENSE_RESULT.Success,
  		light: false,
--		packageType: oPackageType,
+-		packageType: constants.PACKAGE_TYPE_OS,
 +		packageType: constants.PACKAGE_TYPE_I,
  		mode: constants.LICENSE_MODE.None,
  		branding: false,
--		connections: constants.LICENSE_CONNECTIONS,
+ 		connections: constants.LICENSE_CONNECTIONS,
-+		connections: 9999,
+-		customization: false,
- 		customization: false,
++		customization: true,
--		usersCount: 0,
+ 		usersCount: 0,
 -		usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
 -		hasLicense: false,
 -		plugins: false,
--		buildDate: oBuildDate,
++		usersExpire: new Date("2099-01-01T23:59:59.000Z").getTime() / 1000,
--		endDate: null
-+		usersCount: 9999,
-+		usersExpire: 99999,
 +		hasLicense: true,
 +		plugins: true,
-+		buildDate: commonDefines.buildDate,
+ 		buildDate: oBuildDate,
+-		endDate: null
 +		endDate: "2099-01-01T23:59:59.000Z"
  	};
--
--	if (yield* _getFileState()) {
--		res.type = c_LR.ExpiredTrial;
--	}
--
--	if (res.type === c_LR.Expired || res.type === c_LR.ExpiredTrial) {
--		res.count = 1;
--		logger.error('License: License Expired!!!');
--	}
--
--	return res;
  };
--exports.packageType = oPackageType;
+-exports.packageType = constants.PACKAGE_TYPE_OS;
--
--function* _getFileState() {
--	return yield editorData.getLicense(redisKeyLicense);
--}
 +exports.packageType = constants.PACKAGE_TYPE_I;
+diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
+index 471a271..5df4fe0 100644
+--- a/DocService/sources/DocsCoServer.js
++++ b/DocService/sources/DocsCoServer.js
+@@ -103,6 +103,7 @@ const pubsubService = require('./pubsubRabbitMQ');
+ const queueService = require('./../../Common/sources/taskqueueRabbitMQ');
+ const rabbitMQCore = require('./../../Common/sources/rabbitMQCore');
+ const activeMQCore = require('./../../Common/sources/activeMQCore');
++const license = require('./../../Common/sources/license');
+ 
+ const editorDataStorage = require('./' + configCommon.get('services.CoAuthoring.server.editorDataStorage'));
+ let cfgEditor = JSON.parse(JSON.stringify(config.get('editor')));
+@@ -162,7 +163,7 @@ let connections = []; // Активные соединения
+ let lockDocumentsTimerId = {};//to drop connection that can't unlockDocument
+ let pubsub;
+ let queue;
+-let licenseInfo = {type: constants.LICENSE_RESULT.Error, light: false, branding: false, customization: false, plugins: false};
++let licenseInfo = license.readLicense().next().value;
+ let shutdownFlag = false;
+ 
+ const MIN_SAVE_EXPIRATION = 60000;
+@@ -2969,7 +2970,7 @@ exports.install = function(server, callbackFunction) {
+   });
+ };
+ exports.setLicenseInfo = function(data) {
+-  licenseInfo = data;
++  logger.debug('Not updating license info', data)
+ };
+ exports.getLicenseInfo = function() {
+   return licenseInfo;
+diff --git a/DocService/sources/server.js b/DocService/sources/server.js
+index db085bb..7d76d34 100644
+--- a/DocService/sources/server.js
++++ b/DocService/sources/server.js
+@@ -129,7 +129,6 @@ try {
+ } 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');
+ }
+-fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
+ setInterval(updateLicense, 86400000);
+ 
+ // Если захочется использовать 'development' и 'production',
+diff --git a/FileConverter/sources/convertermaster.js b/FileConverter/sources/convertermaster.js
+index c246bb8..9fe3d41 100644
+--- a/FileConverter/sources/convertermaster.js
++++ b/FileConverter/sources/convertermaster.js
+@@ -85,7 +85,6 @@ if (cluster.isMaster) {
+ 
+   updateLicense();
+ 
+-  fs.watchFile(configCommon.get('license').get('license_file'), updateLicense);
+   setInterval(updateLicense, 86400000);
+ } else {
+   const converter = require('./converter');
 diff --git a/Makefile b/Makefile
-index 40bf93e..7109dbd 100644
+index 40bf93e..1df9c10 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1,4 +1,4 @@
--GRUNT = grunt
-+GRUNT = ./node_modules/.bin/grunt
- GRUNT_FLAGS = --no-color -v
- 
- GRUNT_FILES = Gruntfile.js.out
-@@ -46,7 +46,7 @@ endif
- 
- TARGET := $(PLATFORM)_$(ARCHITECTURE)
- 
--OUTPUT = ../build_tools/out/$(TARGET)/onlyoffice/documentserver/server
-+OUTPUT = build/out/$(TARGET)/onlyoffice/documentserver/server
- 
- SPELLCHECKER_DICTIONARIES := $(OUTPUT)/SpellChecker/dictionaries
- SPELLCHECKER_DICTIONARY_FILES += ../dictionaries/*_*
 @@ -83,7 +83,7 @@ DEBUG = $(BRANDING_DIR)/debug.js
  .PHONY: all clean install uninstall build-date
  
  .NOTPARALLEL:
 -all: $(SPELLCHECKER_DICTIONARIES) $(TOOLS) $(SCHEMA) $(CORE_FONTS) $(LICENSE) $(WELCOME) $(INFO) build-date
-+all: 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.26.1
+2.29.2