From ea8658aa22bc3e952ef6e9cd1be64a0962461d36 Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Fri, 2 Jan 2026 21:58:59 +0100
Subject: [PATCH] Abort Portainer start without Docker socket

---
 portainer/CHANGELOG.md                        |  4 ++++
 portainer/config.yaml                         |  2 +-
 portainer/rootfs/etc/services.d/portainer/run | 15 ++++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/portainer/CHANGELOG.md b/portainer/CHANGELOG.md
index 577a07f0a..d622e608e 100644
--- a/portainer/CHANGELOG.md
+++ b/portainer/CHANGELOG.md
@@ -1,4 +1,8 @@
 
+## 2.37.2 (02-01-2026)
+- Improve Docker socket detection with fallback path logging
+- Stop startup when no Docker socket is available
+
 ## 2.37.0 (13-12-2025)
 - Update to latest version from portainer/portainer (changelog : https://github.com/portainer/portainer/releases)
 
diff --git a/portainer/config.yaml b/portainer/config.yaml
index 26369e51e..11245838b 100644
--- a/portainer/config.yaml
+++ b/portainer/config.yaml
@@ -42,4 +42,4 @@ schema:
 slug: portainer
 udev: true
 url: https://github.com/alexbelgium/hassio-addons
-version: "2.37.0"
+version: "2.37.2"
diff --git a/portainer/rootfs/etc/services.d/portainer/run b/portainer/rootfs/etc/services.d/portainer/run
index 33000e64a..4ef116412 100755
--- a/portainer/rootfs/etc/services.d/portainer/run
+++ b/portainer/rootfs/etc/services.d/portainer/run
@@ -11,7 +11,20 @@ declare -a options
 options+=(--data /data)
 options+=(--bind 0.0.0.0:9000)
 #options+=(--templates /opt/portainer/templates.json)
-options+=(--host unix:///var/run/docker.sock)
+
+docker_socket="/var/run/docker.sock"
+if [[ ! -S "$docker_socket" ]]; then
+    fallback_socket="/run/docker.sock"
+    if [[ -S "$fallback_socket" ]]; then
+        docker_socket="$fallback_socket"
+        bashio::log.info "Docker socket not found at /var/run/docker.sock, using /run/docker.sock."
+    else
+        bashio::log.error "Docker socket not found at /var/run/docker.sock or /run/docker.sock."
+        exit 1
+    fi
+fi
+
+options+=(--host "unix://${docker_socket}")
 
 ##############
 # SSL CONFIG #