6 Commits

Author SHA1 Message Date
Alexander Hofbauer
42d32196fa 5.6.2.2 2020-08-07 20:11:24 +02:00
Alexander Hofbauer
6f4181f51a Refresh for version 5.6.0.17 2020-08-03 11:56:25 +02:00
Alexander Hofbauer
4a19854542 Document simple version check 2020-07-12 13:30:48 +02:00
Alexander Hofbauer
a17ec8bbf7 Bump version to 5.5.3.39 2020-07-12 12:42:52 +02:00
Alexander Hofbauer
fe1a3d4391 Improve patch format, use git to apply, enable plugins, fix build date to tag date 2020-04-19 13:07:33 +02:00
Alexander Hofbauer
a1431337a4 Document docker-compose usage 2020-04-19 11:10:27 +02:00
3 changed files with 53 additions and 16 deletions

View File

@@ -1,6 +1,6 @@
ARG oo_version=5.5.1.76
ARG oo_version=5.6.2.2
FROM onlyoffice/documentserver:$oo_version
ARG oo_version=5.5.1.76
ARG oo_version=5.6.2.2
RUN sed -is \
@@ -31,7 +31,7 @@ WORKDIR /build
RUN git clone --branch v$oo_version --depth 1 https://github.com/ONLYOFFICE/server.git .
COPY license.patch /build/
RUN patch -p1 < license.patch
RUN git apply license.patch
RUN npm install pkg grunt-cli \

View File

@@ -2,6 +2,8 @@
## Usage
### CLI
```sh
docker build \
--tag=onlyoffice-patched \
@@ -15,6 +17,23 @@ docker run \
onlyoffice-patched
```
### docker-compose.yml
```yml
services:
onlyoffice:
container_name: onlyoffice
image: onlyoffice-patched
build:
context: https://github.com/aleho/onlyoffice-ce-docker-license.git
```
### Verify
To verify that the container was built successfully simply call
`[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
@@ -26,7 +45,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

View File

@@ -1,23 +1,35 @@
From 49041ccf02617c5a9b92693b3bf65870e6b79006 Mon Sep 17 00:00:00 2001
From: Alexander Hofbauer <alex@derhofbauer.at>
Date: Mon, 3 Aug 2020 11:44:57 +0200
Subject: [PATCH] Enable rebuild with fake license
---
Common/sources/commondefines.js | 5 ++--
Common/sources/license.js | 52 ++++++++-------------------------
Makefile | 6 ++--
3 files changed, 18 insertions(+), 45 deletions(-)
diff --git a/Common/sources/commondefines.js b/Common/sources/commondefines.js
index 4518ac8..34ab4e2 100644
index 694a13a..eb85e04 100644
--- a/Common/sources/commondefines.js
+++ b/Common/sources/commondefines.js
@@ -970,8 +970,8 @@ const c_oAscQueueType = {
activemq: 'activemq'
@@ -975,8 +975,9 @@ const c_oAscUnlockRes = {
Empty: 2
};
-const buildVersion = '4.1.2';
-const buildNumber = 37;
+const buildVersion = '5.5.1';
+const buildNumber = 76;
+const buildVersion = '5.6.2';
+const buildNumber = 2
+exports.buildDate = '2020-08-07T11:23:00.000Z';
exports.TaskQueueData = TaskQueueData;
exports.CMailMergeSendData = CMailMergeSendData;
diff --git a/Common/sources/license.js b/Common/sources/license.js
index 290d85d..c136956 100644
index 290d85d..5a1ab21 100644
--- a/Common/sources/license.js
+++ b/Common/sources/license.js
@@ -32,53 +32,26 @@
@@ -32,53 +32,25 @@
'use strict';
@@ -27,14 +39,15 @@ index 290d85d..c136956 100644
-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 = '6/29/2016';
-const oBuildDate = new Date(buildDate);
-const oPackageType = configL.get('packageType');
-
-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;
@@ -54,12 +67,14 @@ index 290d85d..c136956 100644
- usersCount: 0,
- usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
- hasLicense: false,
- plugins: false,
- buildDate: oBuildDate,
- endDate: null
+ usersCount: 9999,
+ usersExpire: 99999,
+ hasLicense: true,
plugins: false,
buildDate: oBuildDate,
- endDate: null
+ plugins: true,
+ buildDate: commonDefines.buildDate,
+ endDate: "2099-01-01T23:59:59.000Z"
};
-
@@ -108,3 +123,6 @@ index 40bf93e..7109dbd 100644
build-date: $(GRUNT_FILES)
sed "s|\(const buildVersion = \).*|\1'${PRODUCT_VERSION}';|" -i $(COMMON_DEFINES_JS)
--
2.28.0