From 622507b08361f06490f8b5ed39bec0bb85644312 Mon Sep 17 00:00:00 2001
From: technorabilia <simon@technorabilia.com>
Date: Sun, 17 Oct 2021 00:51:24 +0000
Subject: [PATCH] Workflow update

---
 lsio/diskover/docker-compose.yaml | 38 ++++++++++++++-----------------
 lsio/diskover/docker-run.sh       | 13 ++---------
 2 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/lsio/diskover/docker-compose.yaml b/lsio/diskover/docker-compose.yaml
index 6dad7b4..a50a5bd 100644
--- a/lsio/diskover/docker-compose.yaml
+++ b/lsio/diskover/docker-compose.yaml
@@ -1,51 +1,47 @@
-# [Diskover](https://github.com/shirosaidev/diskover) is a file system crawler
-# and disk space usage software that uses Elasticsearch to index and manage data
+# [Diskover](https://github.com/diskoverdata/diskover-community) is an open
+# source file system indexer that uses Elasticsearch to index and manage data
 # across heterogeneous storage systems.
 
 version: '2'
 services:
   diskover:
-    image: linuxserver/diskover
+    image: ghcr.io/linuxserver/diskover
     container_name: diskover
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
-      - REDIS_HOST=redis
-      - REDIS_PORT=6379
+      - TZ=America/New_York
       - ES_HOST=elasticsearch
       - ES_PORT=9200
-      - ES_USER=elastic
-      - ES_PASS=changeme
-      - RUN_ON_START=true
-      - USE_CRON=true
     volumes:
       - /path/to/diskover/config:/config
       - /path/to/diskover/data:/data
     ports:
       - 80:80
-      - 9181:9181
-      - 9999:9999
     mem_limit: 4096m
     restart: unless-stopped
     depends_on:
       - elasticsearch
-      - redis
   elasticsearch:
     container_name: elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:5.6.9
-    volumes:
-      - ${DOCKER_HOME}/elasticsearch/data:/usr/share/elasticsearch/data
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
     environment:
+      - discovery.type=single-node
       - bootstrap.memory_lock=true
-      - "ES_JAVA_OPTS=-Xms2048m -Xmx2048m"
+      - "ES_JAVA_OPTS=-Xms1g -Xmx1g"
     ulimits:
       memlock:
         soft: -1
         hard: -1
-  redis:
-    container_name: redis
-    image: redis:alpine
     volumes:
-      - ${HOME}/docker/redis:/data
+      - /path/to/esdata:/usr/share/elasticsearch/data
+    ports:
+      - 9200:9200
+    depends_on:
+      - elasticsearch-helper
+    restart: unless-stopped
+  elasticsearch-helper:
+    image: alpine
+    command: sh -c "sysctl -w vm.max_map_count=262144"
+    privileged: true
 
diff --git a/lsio/diskover/docker-run.sh b/lsio/diskover/docker-run.sh
index 59c65c6..bb2f5b2 100644
--- a/lsio/diskover/docker-run.sh
+++ b/lsio/diskover/docker-run.sh
@@ -1,5 +1,5 @@
-# [Diskover](https://github.com/shirosaidev/diskover) is a file system crawler
-# and disk space usage software that uses Elasticsearch to index and manage data
+# [Diskover](https://github.com/diskoverdata/diskover-community) is an open
+# source file system indexer that uses Elasticsearch to index and manage data
 # across heterogeneous storage systems.
 
 source ./.env
@@ -8,20 +8,11 @@ docker run -d \
   -e PUID=${PUID:-1024} `# for GroupID` \
   -e PGID=${PGID:-100} `# for UserID` \
   -e TZ=${TZ:-Europe/Amsterdam} `# Specify a timezone to use for example Europe/Amsterdam` \
-  -e REDIS_HOST=redis `# Redis host (optional)` \
-  -e REDIS_PORT=6379 `# Redis port (optional)` \
   -e ES_HOST=elasticsearch `# ElasticSearch host (optional)` \
   -e ES_PORT=9200 `# ElasticSearch port (optional)` \
   -e ES_USER=elastic `# ElasticSearch username (optional)` \
   -e ES_PASS=changeme `# ElasticSearch password (optional)` \
-  -e INDEX_NAME=diskover- `# Index name prefix (optional)` \
-  -e DISKOVER_OPTS= `# Optional arguments to pass to the diskover crawler (optional)` \
-  -e WORKER_OPTS= `# Optional argumens to pass to the diskover bots launcher (optional)` \
-  -e RUN_ON_START=true `# Initiate a crawl every time the container is started (optional)` \
-  -e USE_CRON=true `# Run a crawl on as a cron job (optional)` \
   -p 80:80 `# diskover Web UI` \
-  -p 9181:9181 `# rq-dashboard web UI` \
-  -p 9999:9999 `# diskover socket server` \
   -v ${BASEDIR:-/volume1/docker}/diskover/config:/config `# Persistent config files` \
   -v ${BASEDIR:-/volume1/docker}/diskover/data:/data `# Default mount point to crawl` \
   --restart unless-stopped \