6.3.0.111

Refs #18

.github/workflows/docker-image.yml

@@ -0,0 +1,30 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ main ]
+    tags:
+      - '*'
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set version
+      id: version
+      run: echo ::set-output name=release_version::${GITHUB_REF#refs/*/}
+
+    - name: Build Docker image
+      run: |
+        echo Building version ${{ steps.version.outputs.release_version }}...
+        docker build . --file Dockerfile --tag alehoho/oo-ce-docker-license:${{ steps.version.outputs.release_version }}
+
+    - name: Push Docker image
+      run: |
+        echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+        docker push alehoho/oo-ce-docker-license:${{ steps.version.outputs.release_version }}

Dockerfile

@@ -1,45 +1,68 @@
-ARG product_version=6.0.0
-ARG build_number=105
+ARG product_version=6.3.0
+ARG build_number=111
+ARG oo_root='/var/www/onlyoffice/documentserver'
 
-FROM onlyoffice/documentserver:${product_version}.${build_number}
+
+
+## Setup
+FROM onlyoffice/documentserver:${product_version}.${build_number} as setup-stage
 ARG product_version
 ARG build_number
-
-RUN sed -si \
-  's/isSupportEditFeature:function(){return!1}/isSupportEditFeature:function(){return true}/g' \
-  /var/www/onlyoffice/documentserver/web-apps/apps/documenteditor/mobile/app.js \
-  /var/www/onlyoffice/documentserver/web-apps/apps/presentationeditor/mobile/app.js \
-  /var/www/onlyoffice/documentserver/web-apps/apps/spreadsheeteditor/mobile/app.js
-
-
-# source patching and compilation
-RUN apt update && apt install -y git curl \
-  && curl -sL https://deb.nodesource.com/setup_10.x | bash - \
-  && apt install -y nodejs \
-  && rm -rf /var/lib/apt/lists/*
-
-
-ARG tag=v${product_version}.${build_number}
-RUN  mkdir /build \
-  && 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
-
-COPY license.patch /build/
-
-WORKDIR /build/server
+ARG oo_root
 
 ENV PRODUCT_VERSION=${product_version}
 ENV BUILD_NUMBER=${build_number}
 
-RUN  npm install -g pkg grunt grunt-cli \
-  && git apply /build/license.patch \
-  && 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 /var/www/onlyoffice/documentserver/server/FileConverter/converter \
-  && cp /build/docservice /var/www/onlyoffice/documentserver/server/DocService/docservice \
-  && npm uninstall -g pkg grunt grunt-cli \
-  && rm -rf /root/.cache /root/.config/ /root/.npm/ /root/.pkg-cache \
-  && rm -rf /build
+ARG build_deps="git make g++ nodejs npm"
+RUN apt-get update && apt-get install -y ${build_deps}
+RUN npm install -g pkg grunt grunt-cli
 
-WORKDIR /
+WORKDIR /build
+
+
+
+## Clone
+FROM setup-stage as clone-stage
+ARG tag=v${PRODUCT_VERSION}.${BUILD_NUMBER}
+
+RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/build_tools.git /build/build_tools
+RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/sdkjs.git       /build/sdkjs
+RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/web-apps.git    /build/web-apps
+RUN git clone --quiet --branch $tag --depth 1 https://github.com/ONLYOFFICE/server.git      /build/server
+
+COPY server.patch /build/
+COPY web-apps.patch /build/
+
+RUN cd /build/server   && git apply /build/server.patch
+RUN cd /build/web-apps && git apply /build/web-apps.patch
+
+
+
+## Build
+FROM clone-stage as build-stage
+
+# build server with license checks patched
+WORKDIR /build/server
+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/DocService --targets=node10-linux --options max_old_space_size=4096 -o /build/docservice
+
+# build web-apps with mobile editing
+WORKDIR /build/web-apps/build
+RUN npm install
+RUN grunt
+
+
+
+## Final image
+FROM onlyoffice/documentserver:${product_version}.${build_number}
+ARG oo_root
+
+# server
+COPY --from=build-stage /build/converter  ${oo_root}/server/FileConverter/converter
+COPY --from=build-stage /build/docservice ${oo_root}/server/DocService/docservice
+
+# web-apps
+COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/documenteditor/mobile/app.js     ${oo_root}/web-apps/apps/documenteditor/mobile/app.js
+COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/presentationeditor/mobile/app.js ${oo_root}/web-apps/apps/presentationeditor/mobile/app.js
+COPY --from=build-stage /build/web-apps/deploy/web-apps/apps/spreadsheeteditor/mobile/app.js  ${oo_root}/web-apps/apps/spreadsheeteditor/mobile/app.js

README.md

@@ -1,8 +1,39 @@
-# OnlyOffice Community server with license
+# Patched ONLYOFFICE Docs (Community Edition)
+
+[![Docker Image CI](https://github.com/aleho/onlyoffice-ce-docker-license/actions/workflows/docker-image.yml/badge.svg)](https://github.com/aleho/onlyoffice-ce-docker-license/actions/workflows/docker-image.yml)
+
+## Features
+
+This [Dockerfile](./Dockerfile) and patches compile a version of
+OnlyOffice Docs server with mobile editing enabled in the Nextcloud apps for an
+unlimited amount of concurrent users.
+
+It can be integrated into e.g. Nextcloud or ownCloud like the official images.
+
+## Background
+
+Just about two months after [Nextcloud released their partnership with Ascensio](https://nextcloud.com/blog/onlyoffice-and-nextcloud-partnering-up/)
+and featured a community version of OnlyOffice, the latter decided to remove
+support for mobile editing of documents. This affected the Nextcloud app,
+killing a feature that was previously marketed by both companies.
+
+The changes were executed without any prior notice and alienated quite a lot of
+home users, who would now be forced to pay more than €1.000 to unlock that
+previously free feature. Only after some outcries Ascensio deigned to release a
+statement and a new, albeit "limited", offer of €90 for home servers. This
+offer has since expired and their licensing tier suggests current licenses are
+valid for one year, starting at about €140.
+
+In my opinion these deceptive practices of advertising a feature only to take
+it away are unacceptable for a company presenting itself and their products as
+open source.
 
 
 ## Usage
 
+Please refer the the official docs on how to integrate OnlyOffice into your
+setup.
+
 ### Podman CLI
 
 ```sh
@@ -31,9 +62,16 @@ services:
     container_name: onlyoffice
     image: alehoho/oo-ce-docker-license
     ports:
-      - "80"
+      - "80:80"
 ```
 
+### 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]/index.html` and check the output of that page or
+`[server-url]/web-apps/apps/api/documents/api.js` and check the header comment.
+
 
 ## Build
 
@@ -66,26 +104,6 @@ services:
     …
 ```
 
-### 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
-to remove support for mobile editing of documents via the Nextcloud app.
-
-This happened without any prior notice and alienated quite a lot of home users,
-who would now be forced to pay more than €1.000 to unlock that previously free
-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.
-
 
 ## Thanks
 

server.patch

@@ -1,119 +1,89 @@
-From bfd54caaf3a89d1b2aea5c38ed42c78c113ac7c1 Mon Sep 17 00:00:00 2001
+From 10a7f4497de9e21b5e7708fff75ce15398955d6c Mon Sep 17 00:00:00 2001
 From: Alexander Hofbauer <alex@derhofbauer.at>
-Date: Sun, 18 Oct 2020 15:17:44 +0200
+Date: Fri, 21 May 2021 10:35:05 +0200
 Subject: [PATCH] Patch for license
 
 ---
- Common/sources/commondefines.js          |  4 +-
- Common/sources/license.js                | 66 +++++++++---------------
- DocService/sources/DocsCoServer.js       |  5 +-
+ Common/sources/commondefines.js          |  4 ++--
+ Common/sources/constants.js              |  2 +-
+ Common/sources/license.js                | 16 ++++++++--------
+ DocService/sources/DocsCoServer.js       |  5 +++--
  DocService/sources/server.js             |  1 -
  FileConverter/sources/convertermaster.js |  1 -
  Makefile                                 |  2 +-
- 6 files changed, 30 insertions(+), 49 deletions(-)
+ 7 files changed, 15 insertions(+), 16 deletions(-)
 
 diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
-index 694a13a..6f8a07b 100644
+index ec6a870..e20d966 100644
 --- a/Common/sources/commondefines.js
 +++ b/Common/sources/commondefines.js
-@@ -975,8 +975,8 @@ const c_oAscUnlockRes = {
+@@ -1035,8 +1035,8 @@ const c_oAscUnlockRes = {
    Empty: 2
  };
  
 -const buildVersion = '4.1.2';
 -const buildNumber = 37;
-+const buildVersion = '6.0.0';
-+const buildNumber = 105;
++const buildVersion = '6.3.0';
++const buildNumber = 111;
  
  exports.TaskQueueData = TaskQueueData;
  exports.CMailMergeSendData = CMailMergeSendData;
+diff --git a/Common/sources/constants.js b/Common/sources/constants.js
+index f976ed9..e5b91fd 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..655df27 100644
+index 19f0b61..7aa1d44 100644
 --- a/Common/sources/license.js
 +++ b/Common/sources/license.js
-@@ -32,53 +32,35 @@
+@@ -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 constants = require('./constants');
+ const constants = require('./constants');
  
 -const buildDate = '6/29/2016';
--const oBuildDate = new Date(buildDate);
--const oPackageType = configL.get('packageType');
-+const LICENSE = {
-+	count: 9999,
-+	type: constants.LICENSE_RESULT.Success,
-+	light: false,
-+	packageType: constants.PACKAGE_TYPE_I,
-+	mode: constants.LICENSE_MODE.None,
-+	branding: false,
-+	connections: 9999,
-+	customization: false,
-+	usersCount: 9999,
-+	usersExpire: new Date("2099-01-01T23:59:59.000Z").getTime() / 1000,
-+	hasLicense: true,
-+	plugins: true,
-+	buildDate: "2020-10-15T14:07:00.000Z",
-+	endDate: "2099-01-01T23:59:59.000Z"
-+};
- 
--const cfgRedisPrefix = config.get('services.CoAuthoring.redis.prefix');
--const redisKeyLicense = cfgRedisPrefix + constants.REDIS_KEY_LICENSE;
-+function getLicense() {
-+	logger.debug('Injecting fake license', LICENSE)
- 
--let editorData = new editorDataStorage();
-+	return { ...LICENSE };
-+}
++const buildDate = '2021-05-20T16:02:00.000Z';
+ const oBuildDate = new Date(buildDate);
  
  exports.readLicense = function*() {
--	const c_LR = constants.LICENSE_RESULT;
--	const res = {
--		count: 1,
--		type: c_LR.Error,
--		light: false,
--		packageType: oPackageType,
--		mode: constants.LICENSE_MODE.None,
--		branding: false,
--		connections: constants.LICENSE_CONNECTIONS,
+@@ -43,17 +43,17 @@ exports.readLicense = function*() {
+ 		count: 1,
+ 		type: c_LR.Success,
+ 		light: false,
+-		packageType: constants.PACKAGE_TYPE_OS,
++		packageType: constants.PACKAGE_TYPE_I,
+ 		mode: constants.LICENSE_MODE.None,
+ 		branding: false,
+ 		connections: constants.LICENSE_CONNECTIONS,
 -		customization: false,
--		usersCount: 0,
++		customization: true,
+ 		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,
++		hasLicense: true,
++		plugins: true,
+ 		buildDate: oBuildDate,
 -		endDate: null
--	};
--
--	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;
-+	return getLicense();
++		endDate: "2099-01-01T23:59:59.000Z"
+ 	};
  };
--exports.packageType = oPackageType;
- 
--function* _getFileState() {
--	return yield editorData.getLicense(redisKeyLicense);
--}
-+exports.getLicense = getLicense;
+-exports.packageType = constants.PACKAGE_TYPE_OS;
 +exports.packageType = constants.PACKAGE_TYPE_I;
 diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
-index be22d80..fb19abe 100644
+index 688f3c7..0b67274 100644
 --- a/DocService/sources/DocsCoServer.js
 +++ b/DocService/sources/DocsCoServer.js
-@@ -103,6 +103,7 @@ const pubsubService = require('./pubsubRabbitMQ');
+@@ -102,6 +102,7 @@ const pubsubService = require('./pubsubRabbitMQ');
  const queueService = require('./../../Common/sources/taskqueueRabbitMQ');
  const rabbitMQCore = require('./../../Common/sources/rabbitMQCore');
  const activeMQCore = require('./../../Common/sources/activeMQCore');
@@ -126,11 +96,11 @@ index be22d80..fb19abe 100644
  let pubsub;
  let queue;
 -let licenseInfo = {type: constants.LICENSE_RESULT.Error, light: false, branding: false, customization: false, plugins: false};
-+let licenseInfo = license.getLicense();
++let licenseInfo = license.readLicense().next().value;
  let shutdownFlag = false;
+ let expDocumentsStep = gc.getCronStep(cfgExpDocumentsCron);
  
- const MIN_SAVE_EXPIRATION = 60000;
-@@ -3013,7 +3014,7 @@ exports.install = function(server, callbackFunction) {
+@@ -3093,7 +3094,7 @@ exports.install = function(server, callbackFunction) {
    });
  };
  exports.setLicenseInfo = function(data) {
@@ -140,7 +110,7 @@ index be22d80..fb19abe 100644
  exports.getLicenseInfo = function() {
    return licenseInfo;
 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
 +++ b/DocService/sources/server.js
 @@ -129,7 +129,6 @@ try {
@@ -177,5 +147,5 @@ index 40bf93e..1df9c10 100644
  build-date: $(GRUNT_FILES)
  	sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
 -- 
-2.28.0
+2.31.1