mirror of
https://github.com/aleho/onlyoffice-ce-docker-license.git
synced 2026-01-01 05:34:04 +01:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f4181f51a | ||
|
|
4a19854542 | ||
|
|
a17ec8bbf7 | ||
|
|
fe1a3d4391 | ||
|
|
a1431337a4 |
@@ -1,6 +1,6 @@
|
|||||||
ARG oo_version=5.5.1.76
|
ARG oo_version=5.6.0.17
|
||||||
FROM onlyoffice/documentserver:$oo_version
|
FROM onlyoffice/documentserver:$oo_version
|
||||||
ARG oo_version=5.5.1.76
|
ARG oo_version=5.6.0.17
|
||||||
|
|
||||||
|
|
||||||
RUN sed -is \
|
RUN sed -is \
|
||||||
@@ -31,7 +31,7 @@ WORKDIR /build
|
|||||||
RUN git clone --branch v$oo_version --depth 1 https://github.com/ONLYOFFICE/server.git .
|
RUN git clone --branch v$oo_version --depth 1 https://github.com/ONLYOFFICE/server.git .
|
||||||
|
|
||||||
COPY license.patch /build/
|
COPY license.patch /build/
|
||||||
RUN patch -p1 < license.patch
|
RUN git apply license.patch
|
||||||
|
|
||||||
|
|
||||||
RUN npm install pkg grunt-cli \
|
RUN npm install pkg grunt-cli \
|
||||||
|
|||||||
21
README.md
21
README.md
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
## Usage
|
## Usage
|
||||||
|
|
||||||
|
### CLI
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
docker build \
|
docker build \
|
||||||
--tag=onlyoffice-patched \
|
--tag=onlyoffice-patched \
|
||||||
@@ -15,6 +17,23 @@ docker run \
|
|||||||
onlyoffice-patched
|
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
|
## Background
|
||||||
Recently, just about a month after Nextcloud announced their partnership with
|
Recently, just about a month after Nextcloud announced their partnership with
|
||||||
Ascensio and featuring a community version of OnlyOffice, the latter decided
|
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.
|
a new, albeit "limited", offer of €90 for home servers.
|
||||||
|
|
||||||
In my opinion these deceptive practices are unacceptable for a company
|
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
|
## Thanks
|
||||||
|
|||||||
@@ -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
|
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
|
--- a/Common/sources/commondefines.js
|
||||||
+++ b/Common/sources/commondefines.js
|
+++ b/Common/sources/commondefines.js
|
||||||
@@ -970,8 +970,8 @@ const c_oAscQueueType = {
|
@@ -975,8 +975,9 @@ const c_oAscUnlockRes = {
|
||||||
activemq: 'activemq'
|
Empty: 2
|
||||||
};
|
};
|
||||||
|
|
||||||
-const buildVersion = '4.1.2';
|
-const buildVersion = '4.1.2';
|
||||||
-const buildNumber = 37;
|
-const buildNumber = 37;
|
||||||
+const buildVersion = '5.5.1';
|
+const buildVersion = '5.6.0';
|
||||||
+const buildNumber = 76;
|
+const buildNumber = 17;
|
||||||
|
+exports.buildDate = '2020-07-29T10:19:00.000Z';
|
||||||
|
|
||||||
exports.TaskQueueData = TaskQueueData;
|
exports.TaskQueueData = TaskQueueData;
|
||||||
exports.CMailMergeSendData = CMailMergeSendData;
|
exports.CMailMergeSendData = CMailMergeSendData;
|
||||||
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 290d85d..c136956 100644
|
index 290d85d..5a1ab21 100644
|
||||||
--- a/Common/sources/license.js
|
--- a/Common/sources/license.js
|
||||||
+++ b/Common/sources/license.js
|
+++ b/Common/sources/license.js
|
||||||
@@ -32,53 +32,26 @@
|
@@ -32,53 +32,25 @@
|
||||||
|
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
@@ -27,14 +39,15 @@ index 290d85d..c136956 100644
|
|||||||
-const logger = require('./logger');
|
-const logger = require('./logger');
|
||||||
-const editorDataStorage = require('./../../DocService/sources/' + config.get('services.CoAuthoring.server.editorDataStorage'));
|
-const editorDataStorage = require('./../../DocService/sources/' + config.get('services.CoAuthoring.server.editorDataStorage'));
|
||||||
-
|
-
|
||||||
const buildDate = '6/29/2016';
|
-const buildDate = '6/29/2016';
|
||||||
const oBuildDate = new Date(buildDate);
|
-const oBuildDate = new Date(buildDate);
|
||||||
-const oPackageType = configL.get('packageType');
|
-const oPackageType = configL.get('packageType');
|
||||||
-
|
-
|
||||||
-const cfgRedisPrefix = config.get('services.CoAuthoring.redis.prefix');
|
-const cfgRedisPrefix = config.get('services.CoAuthoring.redis.prefix');
|
||||||
-const redisKeyLicense = cfgRedisPrefix + constants.REDIS_KEY_LICENSE;
|
-const redisKeyLicense = cfgRedisPrefix + constants.REDIS_KEY_LICENSE;
|
||||||
-
|
-
|
||||||
-let editorData = new editorDataStorage();
|
-let editorData = new editorDataStorage();
|
||||||
|
+const commonDefines = require('./commondefines');
|
||||||
|
|
||||||
exports.readLicense = function*() {
|
exports.readLicense = function*() {
|
||||||
- const c_LR = constants.LICENSE_RESULT;
|
- const c_LR = constants.LICENSE_RESULT;
|
||||||
@@ -54,12 +67,14 @@ index 290d85d..c136956 100644
|
|||||||
- usersCount: 0,
|
- usersCount: 0,
|
||||||
- usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
|
- usersExpire: constants.LICENSE_EXPIRE_USERS_ONE_DAY,
|
||||||
- hasLicense: false,
|
- hasLicense: false,
|
||||||
|
- plugins: false,
|
||||||
|
- buildDate: oBuildDate,
|
||||||
|
- endDate: null
|
||||||
+ usersCount: 9999,
|
+ usersCount: 9999,
|
||||||
+ usersExpire: 99999,
|
+ usersExpire: 99999,
|
||||||
+ hasLicense: true,
|
+ hasLicense: true,
|
||||||
plugins: false,
|
+ plugins: true,
|
||||||
buildDate: oBuildDate,
|
+ buildDate: commonDefines.buildDate,
|
||||||
- endDate: null
|
|
||||||
+ endDate: "2099-01-01T23:59:59.000Z"
|
+ endDate: "2099-01-01T23:59:59.000Z"
|
||||||
};
|
};
|
||||||
-
|
-
|
||||||
@@ -108,3 +123,6 @@ index 40bf93e..7109dbd 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.28.0
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user