From 29bd4e7a6c65e4ed3d720d753eefcc5621efb7d5 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:41:18 +0100
Subject: [PATCH 1/6] Correct OCR packages

---
 nextcloud/root/etc/cont-init.d/51-ocr | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/nextcloud/root/etc/cont-init.d/51-ocr b/nextcloud/root/etc/cont-init.d/51-ocr
index 149a6a16b..9e41f0efc 100644
--- a/nextcloud/root/etc/cont-init.d/51-ocr
+++ b/nextcloud/root/etc/cont-init.d/51-ocr
@@ -4,24 +4,14 @@
 if bashio::config.has_value 'OCR'; then
     if $(bashio::config 'OCR') = true; then
         bashio::log.info 'Installing OCR'
-        apk add --no-cache tesseract-ocr@community
+        apk add --no-cache tesseract-ocr || apk add --no-cache tesseract-ocr@community
         # Install additional language if requested
         if bashio::config.has_value 'OCRLANG'; then
             bashio::log.info 'Installing OCR language'
-            apk add --no-cache tesseract-ocr-data-$(bashio::config 'OCRLANG')@community
+            apk add --no-cache tesseract-ocr-data-$(bashio::config 'OCRLANG') || apk add --no-cache tesseract-ocr-data-$(bashio::config 'OCRLANG')@community 
         fi    
     elif $(bashio::config 'OCR') = false; then
         bashio::log.info 'Removing OCR'
         apk del tesseract-ocr.* || true
     fi
 fi
-
-# Add additional trusted domains
-
-# if bashio::config.has_value 'Trusted_Domains'; then
-# TRUSTEDDOMAINS=$(bashio::config 'Trusted_Domains')
-# for domains in $TRUSTEDDOMAINS
-# do
-# ./occ config:system:set trusted_domains 2 --value=$domains
-# done || \
-# fi

From 856b25d5966f143818355c5996c953d8138f3a9e Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 1 Nov 2021 22:43:36 +0100
Subject: [PATCH 2/6] Repair OCR languages

---
 nextcloud/CHANGELOG.md                |  3 ++-
 nextcloud/config.json                 | 14 +++-----------
 nextcloud/root/etc/cont-init.d/51-ocr |  5 +++--
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/nextcloud/CHANGELOG.md b/nextcloud/CHANGELOG.md
index 2d9f60c4b..a7237f743 100644
--- a/nextcloud/CHANGELOG.md
+++ b/nextcloud/CHANGELOG.md
@@ -1,5 +1,6 @@
 - Repaired use own certs
-- Repair increment of trusted domains
+- Repaired increment of trusted domains
+- Repaired setting OCR language
 
 ## 22.2.0 (02-10-2021)
 - Update to latest version from linuxserver/docker-nextcloud
diff --git a/nextcloud/config.json b/nextcloud/config.json
index ec7d38d2a..c010bc60a 100644
--- a/nextcloud/config.json
+++ b/nextcloud/config.json
@@ -1,24 +1,16 @@
 {
   "name": "Nextcloud OCR",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "22.2.0-4",
+  "version": "22.2.0-5",
   "upstream": "22.2.0",
   "slug": "nextcloud_ocr",
   "ingress": false,
   "ingress_port": 0,
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armv7"
-  ],
+  "arch": ["aarch64", "amd64", "armv7"],
   "description": "Nextcloud for Home Assistant",
   "boot": "manual",
   "uart": true,
-  "map": [
-    "share:rw",
-    "media:rw",
-    "ssl:rw"
-  ],
+  "map": ["share:rw", "media:rw", "ssl:rw"],
   "ports": {
     "443/tcp": 8099,
     "80/tcp": null
diff --git a/nextcloud/root/etc/cont-init.d/51-ocr b/nextcloud/root/etc/cont-init.d/51-ocr
index 9e41f0efc..09e29088a 100644
--- a/nextcloud/root/etc/cont-init.d/51-ocr
+++ b/nextcloud/root/etc/cont-init.d/51-ocr
@@ -7,8 +7,9 @@ if bashio::config.has_value 'OCR'; then
         apk add --no-cache tesseract-ocr || apk add --no-cache tesseract-ocr@community
         # Install additional language if requested
         if bashio::config.has_value 'OCRLANG'; then
-            bashio::log.info 'Installing OCR language'
-            apk add --no-cache tesseract-ocr-data-$(bashio::config 'OCRLANG') || apk add --no-cache tesseract-ocr-data-$(bashio::config 'OCRLANG')@community 
+            LANG=$(bashio::config 'OCRLANG')
+            bashio::log.info "Installing OCR language : $LANG"
+            apk add --no-cache tesseract-ocr-data-$LANG || apk add --no-cache tesseract-ocr-data-$LANG@community 
         fi    
     elif $(bashio::config 'OCR') = false; then
         bashio::log.info 'Removing OCR'

From b192f7dbccf5ae542a28eee01a9cdf986a6dccde Mon Sep 17 00:00:00 2001
From: alexbelgium <alexandre.pary@gmail.com>
Date: Tue, 2 Nov 2021 01:56:30 +0100
Subject: [PATCH 3/6] Update to 2.18.0

---
 filebrowser/CHANGELOG.md |  3 +++
 filebrowser/Dockerfile   |  2 +-
 filebrowser/config.json  | 25 ++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/filebrowser/CHANGELOG.md b/filebrowser/CHANGELOG.md
index 84931589f..db16aa1e7 100644
--- a/filebrowser/CHANGELOG.md
+++ b/filebrowser/CHANGELOG.md
@@ -1,3 +1,6 @@
+
+## 2.18.0 (02-11-2021)
+- Update to latest version from hurlenko/filebrowser-docker
 - Allow mounting of devices up to sdg2
 - Allow uploads >16mb
 - Allow local mount in protected mode
diff --git a/filebrowser/Dockerfile b/filebrowser/Dockerfile
index e4cbb50ac..846945fcc 100644
--- a/filebrowser/Dockerfile
+++ b/filebrowser/Dockerfile
@@ -1,5 +1,5 @@
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="2.17.2"
+ARG BUILD_UPSTREAM="2.18.0"
 FROM hurlenko/filebrowser:v${BUILD_UPSTREAM}
 ARG BASHIO_VERSION=0.13.1
 
diff --git a/filebrowser/config.json b/filebrowser/config.json
index 54344e8a0..7628a1062 100644
--- a/filebrowser/config.json
+++ b/filebrowser/config.json
@@ -1,6 +1,11 @@
 {
   "apparmor": true,
-  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7",
+    "armhf"
+  ],
   "description": "filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files",
   "devices": [
     "/dev/sda1",
@@ -24,7 +29,14 @@
   "ingress": true,
   "ingress_port": 8099,
   "ingress_stream": true,
-  "map": ["media:rw", "config:rw", "addons:rw", "backup:rw", "share:rw", "ssl"],
+  "map": [
+    "media:rw",
+    "config:rw",
+    "addons:rw",
+    "backup:rw",
+    "share:rw",
+    "ssl"
+  ],
   "name": "Filebrowser",
   "options": {
     "ssl": false,
@@ -42,7 +54,10 @@
   "ports_description": {
     "8080/tcp": "Web UI port"
   },
-  "privileged": ["SYS_ADMIN", "DAC_READ_SEARCH"],
+  "privileged": [
+    "SYS_ADMIN",
+    "DAC_READ_SEARCH"
+  ],
   "schema": {
     "ssl": "bool",
     "certfile": "str",
@@ -56,8 +71,8 @@
   },
   "slug": "filebrowser",
   "startup": "services",
-  "upstream": "2.17.2",
+  "upstream": "2.18.0",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "2.17.2-7",
+  "version": "2.18.0",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]"
 }

From 49449eddc1e95e31b7b2ec0dcfaa276b325da40b Mon Sep 17 00:00:00 2001
From: alexbelgium <alexandre.pary@gmail.com>
Date: Tue, 2 Nov 2021 01:57:11 +0100
Subject: [PATCH 4/6] Update to 0.19.116

---
 jackett/CHANGELOG.md | 3 +++
 jackett/config.json  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/jackett/CHANGELOG.md b/jackett/CHANGELOG.md
index f5d5a226d..b16d90a16 100644
--- a/jackett/CHANGELOG.md
+++ b/jackett/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 0.19.116 (02-11-2021)
+- Update to latest version from linuxserver/docker-jackett
+
 ## 0.19.108 (31-10-2021)
 - Update to latest version from linuxserver/docker-jackett
 
diff --git a/jackett/config.json b/jackett/config.json
index 06d2d486c..88e69cd79 100644
--- a/jackett/config.json
+++ b/jackett/config.json
@@ -44,8 +44,8 @@
   },
   "slug": "jackett_nas",
   "startup": "services",
-  "upstream": "0.19.108",
+  "upstream": "0.19.116",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "0.19.108",
+  "version": "0.19.116",
   "webui": "http://[HOST]:[PORT:9117]"
 }

From 975c4fae696845ac2b871acbe464ccacc42ac7fc Mon Sep 17 00:00:00 2001
From: alexbelgium <alexandre.pary@gmail.com>
Date: Tue, 2 Nov 2021 01:57:35 +0100
Subject: [PATCH 5/6] Update to 2.5.10

---
 joplin/CHANGELOG.md | 3 +++
 joplin/config.json  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/joplin/CHANGELOG.md b/joplin/CHANGELOG.md
index ebf768bae..a0b5dc973 100644
--- a/joplin/CHANGELOG.md
+++ b/joplin/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 2.5.10 (02-11-2021)
+- Update to latest version from laurent22/joplin
+
 ## 2.5.8 (31-10-2021)
 - Update to latest version from laurent22/joplin
 
diff --git a/joplin/config.json b/joplin/config.json
index 53ad0aea2..b0b3d61c0 100644
--- a/joplin/config.json
+++ b/joplin/config.json
@@ -1,7 +1,7 @@
 {
   "name": "Joplin Server",
-  "version": "2.5.8",
-  "upstream": "2.5.8",
+  "version": "2.5.10",
+  "upstream": "2.5.10",
   "slug": "joplin",
   "description": "Self-hosted open source note-taking application",
   "url": "https://github.com/alexbelgium/hassio-addons",

From ccaaccbe6cd0a403fda340ebfd063512d58a0bb9 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Tue, 2 Nov 2021 08:24:35 +0100
Subject: [PATCH 6/6] Create 51-elasticsearch

---
 nextcloud/root/etc/cont-init.d/51-elasticsearch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 nextcloud/root/etc/cont-init.d/51-elasticsearch

diff --git a/nextcloud/root/etc/cont-init.d/51-elasticsearch b/nextcloud/root/etc/cont-init.d/51-elasticsearch
new file mode 100644
index 000000000..e058e2f14
--- /dev/null
+++ b/nextcloud/root/etc/cont-init.d/51-elasticsearch
@@ -0,0 +1,17 @@
+#!/usr/bin/with-contenv bashio
+
+# Install OCR if requested
+if bashio::config.has_value 'test'; then
+
+#apt-get install openjdk-8-jre
+apt install apt-transport-https
+wget -qO - https://artifacts.elastic.co/GPG-KEY-elasticsearch | apt-key add -
+echo "deb https://artifacts.elastic.co/packages/6.x/apt stable main" | tee -a /etc/apt/sources.list.d/elasticsearch.list
+apt update
+apt install elasticsearch
+systemctl daemon-reload \
+&& systemctl enable elasticsearch\
+&& systemctl start elasticsearch
+/usr/share/elasticsearch/bin/elasticsearch-plugin install ingest-attachment
+systemctl restart elasticsearch
+fi