Merge pull request #3 from jiriks74/master

Update working branch

.travis.yml

@@ -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

README.md

@@ -1,3 +1,66 @@
+# 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
+#### 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 (SSD will probably help, I'm running only on HDD)
+
+#### 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`
+
+## 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.
+
+<details>
+	
+	
 * [Overview](#overview)
 * [Functionality](#functionality)
 * [Recommended System Requirements](#recommended-system-requirements)
@@ -337,3 +400,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
+
+	
+</details>

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'