From 2a34984f86881de806de4db13f05f633e0af6df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Wed, 9 Mar 2022 19:47:15 +0100 Subject: [PATCH 1/8] Update README.md --- README.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/README.md b/README.md index 18fb96e..1439e3c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,44 @@ +# FOR ARM64 ONLY +--- +## Onlyoffice-Documentserver with `arm64` support +### This runs a modified version of the official deb package with the help of `qemu` and `binfmt` +### To see how I did it, look [at this comment](https://github.com/ONLYOFFICE/DocumentServer/issues/152#issuecomment-1061902836) - I used this method and put it in `Dockerfile` so you don't have to mess aroud with your system in any weird ways (like in the mentioned comment) + +## Installation +#### 1. Clone the repository (for example to your home directory `cd /home/$USER/`) + + `git clone https://github.com/jiriks74/Docker-DocumentServer-Arm64.git && cd Docker-DocumentServer-Arm64` + +#### 2. Build the docker image + `docker-compose build` + - This will take a long time. The things that takte the longes are `dpkg-deb: building package 'onlyoffice-documentserver' in 'onlyoffice-documentserver-modified.deb'` and `Generating presentation themes...` - Both of them take like 20 minutes, it's not stuck, it's just slow + +#### 3. Create and start the container + `docker-compose up -d --build` + - This will start the server. It is set to be automatically started/restarted so as long you have docker running on startup this will start automatically + +## Updating +#### 1. Stop and delete the old container + + `docker-compose down` + +#### 2. (optional) Clear the docker cache +#### - ! This will remove all unused cache images ! (good for saving space, bad if you develop with and need cache, but you understand it at that point) + + `docker rmi $(docker images -f "dangling=true" -q)` + +#### 4. Rebuild the image without cache + + `docker-compose build --no-cache` + +#### 3. Create and start the new container + + `docker-compose up -d` + +--- + +## The rest of this file is the official `README.md`. I will not change anything in it, it may not work. If you care about something, make a pull request and we'll figure it out. + * [Overview](#overview) * [Functionality](#functionality) * [Recommended System Requirements](#recommended-system-requirements) -- 2.45.2 From 00a3164f4abbe890a1aaed223e7014c28a87fec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Wed, 9 Mar 2022 19:48:13 +0100 Subject: [PATCH 2/8] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 1439e3c..b19641b 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,9 @@ ## The rest of this file is the official `README.md`. I will not change anything in it, it may not work. If you care about something, make a pull request and we'll figure it out. +
+ + * [Overview](#overview) * [Functionality](#functionality) * [Recommended System Requirements](#recommended-system-requirements) @@ -378,3 +381,6 @@ If you have any problems with or questions about this image, please visit our of [1]: https://forum.onlyoffice.com [2]: https://stackoverflow.com/questions/tagged/onlyoffice + + +
-- 2.45.2 From 2514966acd34eb10790b2f58eb0b7ae49855c0c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Wed, 9 Mar 2022 19:48:28 +0100 Subject: [PATCH 3/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b19641b..fba0d69 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # FOR ARM64 ONLY ---- + ## Onlyoffice-Documentserver with `arm64` support ### This runs a modified version of the official deb package with the help of `qemu` and `binfmt` ### To see how I did it, look [at this comment](https://github.com/ONLYOFFICE/DocumentServer/issues/152#issuecomment-1061902836) - I used this method and put it in `Dockerfile` so you don't have to mess aroud with your system in any weird ways (like in the mentioned comment) -- 2.45.2 From cee6f7b507e89885c8d08df2ae611aa9da724f48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Wed, 9 Mar 2022 19:50:04 +0100 Subject: [PATCH 4/8] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index fba0d69..47c0a30 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,10 @@ # FOR ARM64 ONLY ## Onlyoffice-Documentserver with `arm64` support + ### This runs a modified version of the official deb package with the help of `qemu` and `binfmt` +### It's also based on the official `Dockerfile` and `docker-compose.yml` files with all the needed files as well + ### To see how I did it, look [at this comment](https://github.com/ONLYOFFICE/DocumentServer/issues/152#issuecomment-1061902836) - I used this method and put it in `Dockerfile` so you don't have to mess aroud with your system in any weird ways (like in the mentioned comment) ## Installation -- 2.45.2 From e50679fd0d7794495770db111985aa816da23b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Wed, 9 Mar 2022 20:17:41 +0100 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 47c0a30..06b6553 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ #### 2. Build the docker image `docker-compose build` - - This will take a long time. The things that takte the longes are `dpkg-deb: building package 'onlyoffice-documentserver' in 'onlyoffice-documentserver-modified.deb'` and `Generating presentation themes...` - Both of them take like 20 minutes, it's not stuck, it's just slow + - This will take a long time. The things that takte the longes are `dpkg-deb: building package 'onlyoffice-documentserver' in 'onlyoffice-documentserver-modified.deb'` and `Generating presentation themes...` - Both of them take like 20 minutes, it's not stuck, it's just slow (SSD will probably help, I'm running only on HDD) #### 3. Create and start the container `docker-compose up -d --build` -- 2.45.2 From 58334f6ab9ab29728449cdb4e7d1e3d879f5327b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Thu, 10 Mar 2022 00:05:11 +0100 Subject: [PATCH 6/8] Update README.md --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index 06b6553..44fb4ac 100644 --- a/README.md +++ b/README.md @@ -38,6 +38,22 @@ `docker-compose up -d` +## Setup `Secret key`with Nextcloud +1. Uncomment four lines starting with `JWT` in `docker-compose` +2. Set your secret on line `JWT_SECRET=yourSecret` +3. Open Nexcloud's `config.php` (by defauld `/var/www/nextcloud/config/config.php`) +4. Add this to the 2nd last line (before the line with `);`) and paste in your secret (3rd last line) +```php + 'onlyoffice' => + array ( + "jwt_secret" => "yourSecret", + "jwt_header" => "AuthorizationJwt" + ) +``` +5. Go to your Nextcloud settings, navigate to Onlyoffice settings +6. Add your server Address and Secret key +7. Save + --- ## The rest of this file is the official `README.md`. I will not change anything in it, it may not work. If you care about something, make a pull request and we'll figure it out. -- 2.45.2 From 6f4eb40f9148c5321644dc54e5de1bc7341aee03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Thu, 10 Mar 2022 00:05:54 +0100 Subject: [PATCH 7/8] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c93b4b7..91863c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: # Uncomment strings below to enable the JSON Web Token validation. #- JWT_ENABLED=true #- JWT_SECRET=secret - #- JWT_HEADER=Authorization + #- JWT_HEADER=AuthorizationJwt #- JWT_IN_BODY=true ports: - '80:80' -- 2.45.2 From 610d7b8e45cb37904b62ce45baf430b4060b6056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= Date: Thu, 10 Mar 2022 00:06:31 +0100 Subject: [PATCH 8/8] Delete .travis.yml --- .travis.yml | 131 ---------------------------------------------------- 1 file changed, 131 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 084cddc..0000000 --- a/.travis.yml +++ /dev/null @@ -1,131 +0,0 @@ -language: generic - -dist: trusty - -env: - # community edition - - config: standalone.yml - - # integration edition - - config: standalone.yml - PRODUCT_NAME: documentserver-ie - - - # certificates (default tls if onlyoffice not exists) - - config: certs.yml - ssl: true - - # certificates (default onlyoffice if exists) - - config: certs.yml - ssl: true - private_key: onlyoffice.key - certificate_request: onlyoffice.csr - certificate: onlyoffice.crt - - # custom certificates - - config: certs-customized.yml - ssl: true - private_key: mycert.key - certificate_request: mycert.csr - certificate: mycert.crt - SSL_CERTIFICATE_PATH: /var/www/onlyoffice/Data/certs/mycert.crt - SSL_KEY_PATH: /var/www/onlyoffice/Data/certs/mycert.key - - - # postgresql 12 - - config: postgres.yml - POSTGRES_VERSION: 12 - - # postgresql 11 - - config: postgres.yml - POSTGRES_VERSION: 11 - - # postgresql 10 - - config: postgres.yml - POSTGRES_VERSION: 10 - - # postgresql 9 - - config: postgres.yml - POSTGRES_VERSION: 9 - - # postgresql 9.5 - - config: postgres.yml - - # postgresql custom values - - config: postgres.yml - DB_NAME: mydb - DB_USER: myuser - DB_PWD: password - POSTGRES_DB: mydb - POSTGRES_USER: myuser - - # postgresql deprecated variables - - config: postgres-old.yml - - - # mysql 8 - - config: mysql.yml - MYSQL_VERSION: 8 - - # mysql 5 - - config: mysql.yml - MYSQL_VERSION: 5 - - # mysql 5.7 - - config: mysql.yml - - - # mariadb 10 - - config: mariadb.yml - MARIADB_VERSION: 10 - - # mariadb 10.5 - - config: mariadb.yml - - - - config: activemq.yml - ACTIVEMQ_VERSION: latest - - # activemq 5.14.3 - - config: activemq.yml - - - # rabbitmq latest - - config: rabbitmq.yml - - # rabbitmq 3 - - config: rabbitmq.yml - RABBITMQ_VERSION: 3 - - # rabbitmq old variables - - config: rabbitmq-old.yml - - - # redis latest with community edition - - config: redis.yml - - # redis latest with integraion edition - - config: redis.yml - PRODUCT_NAME: documentserver-ie - - # redis 6 - - config: redis.yml - REDIS_VERSION: 6 - - # redis 5 - - config: redis.yml - REDIS_VERSION: 5 - - - # graphite - - config: graphite.yml - -services: - - docker - -script: - # Go to tests dir - - cd ${PWD}/tests - - # Run test. - - ./test.sh -- 2.45.2