From 68244f8497eeb61153b42b3b802af8cf895c433a Mon Sep 17 00:00:00 2001
From: Aroy-Art <Aroy-Art@pm.me>
Date: Mon, 24 Mar 2025 10:43:40 +0100
Subject: [PATCH] Endlessh Stack: replace the old depricated image with
 endlessh-go

---
 .../Endlessh/docker-compose.yml               | 51 +++++++++++++------
 Docker/Docker-Compose/Endlessh/env-sample     |  7 +++
 2 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 Docker/Docker-Compose/Endlessh/env-sample

diff --git a/Docker/Docker-Compose/Endlessh/docker-compose.yml b/Docker/Docker-Compose/Endlessh/docker-compose.yml
index c205da9..fbd8d3b 100644
--- a/Docker/Docker-Compose/Endlessh/docker-compose.yml
+++ b/Docker/Docker-Compose/Endlessh/docker-compose.yml
@@ -1,27 +1,46 @@
 ######################################################
 # Endlessh
-# URL: https://github.com/linuxserver/docker-endlessh
+# URL: https://github.com/shizunge/endlessh-go
 ######################################################
-version: "2.1"
+name: endlessh-stack
+
 services:
+
   endlessh:
-    image: lscr.io/linuxserver/endlessh:latest
-    container_name: endlessh
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=Europe/Stockholm
-      - MSDELAY=10000 #optional
-      - MAXLINES=32 #optional
-      - MAXCLIENTS=4096 #optional
-      - LOGFILE=false #optional
-      - BINDFAMILY= #optional
+#    container_name: endlessh
+    image: shizunge/endlessh-go:latest
+    restart: unless-stopped
+    #user: root
+    command:
+      - "-logtostderr"
+      - "-v=1"
+      - "-geoip_supplier=max-mind-db"
+      - "-max_mind_db=/geo-data/GeoLite2-City.mmdb"
+    networks:
+      - example_network
+    ports:
+      - 22:2222 # SSH port
+      - 127.0.0.1:2112:2112 # Prometheus metrics port
     volumes:
-      - ./Data:/config #optional
+      - ./geo-data/:/geo-data/:ro # geoip data
     logging:
       driver: loki
       options:
         loki-url: "${LOKI_URL}"
-    ports:
-      - 22:2222
+
+  geoipupdate:
+    image: ghcr.io/maxmind/geoipupdate:v5
+#    container_name: geoipupdate
     restart: unless-stopped
+    security_opt: [ "no-new-privileges:true" ]
+    volumes:
+      - ./geo-data/:/usr/share/GeoIP/
+    environment:
+      - GEOIPUPDATE_EDITION_IDS=GeoLite2-City
+      - GEOIPUPDATE_FREQUENCY=72
+      - GEOIPUPDATE_ACCOUNT_ID=${MAXMIND_ACCOUNT_ID}
+      - GEOIPUPDATE_LICENSE_KEY=${MAXMIND_LICENSE_KEY}
+    logging:
+      driver: loki
+      options:
+        loki-url: "${LOKI_URL}"
diff --git a/Docker/Docker-Compose/Endlessh/env-sample b/Docker/Docker-Compose/Endlessh/env-sample
new file mode 100644
index 0000000..5ba2511
--- /dev/null
+++ b/Docker/Docker-Compose/Endlessh/env-sample
@@ -0,0 +1,7 @@
+
+# the urls to where your loki instance is running
+LOKI_URL=
+
+# Maxminds accont login info
+MAXMIND_ACCOUNT_ID=
+MAXMIND_LICENSE_KEY=