From c4fb5a096177d54e91084176f2cc2b51b453cc70 Mon Sep 17 00:00:00 2001
From: Simon L <szaimen@e.mail.de>
Date: Thu, 24 Aug 2023 16:18:03 +0200
Subject: [PATCH] improve some deails with docker-socket-proxy

Signed-off-by: Simon L <szaimen@e.mail.de>
---
 Containers/docker-socket-proxy/Dockerfile  | 4 +++-
 Containers/docker-socket-proxy/haproxy.cfg | 2 +-
 php/src/Docker/DockerActionManager.php     | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Containers/docker-socket-proxy/Dockerfile b/Containers/docker-socket-proxy/Dockerfile
index b8eb3364..8bb25982 100644
--- a/Containers/docker-socket-proxy/Dockerfile
+++ b/Containers/docker-socket-proxy/Dockerfile
@@ -26,7 +26,7 @@ ENV ALLOW_RESTARTS=1 \
     NODES=0 \
     PING=1 \
     PLUGINS=0 \
-    POST=0 \
+    POST=1 \
     SECRETS=0 \
     SERVICES=0 \
     SESSION=0 \
@@ -39,3 +39,5 @@ ENV ALLOW_RESTARTS=1 \
 COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
 
 USER haproxy:root
+
+HEALTHCHECK CMD nc -z 127.0.0.1 2375 || exit 1
diff --git a/Containers/docker-socket-proxy/haproxy.cfg b/Containers/docker-socket-proxy/haproxy.cfg
index 4eae253d..44545e02 100644
--- a/Containers/docker-socket-proxy/haproxy.cfg
+++ b/Containers/docker-socket-proxy/haproxy.cfg
@@ -7,7 +7,7 @@ global
     maxconn 4000
 
     # Turn on stats unix socket
-    server-state-file /var/lib/haproxy/server-state
+    # server-state-file /var/lib/haproxy/server-state
 
 defaults
     mode http
diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
index 0e9228d6..3acbcb3f 100644
--- a/php/src/Docker/DockerActionManager.php
+++ b/php/src/Docker/DockerActionManager.php
@@ -831,7 +831,9 @@ class DockerActionManager
 
     public function ConnectContainerToNetwork(Container $container) : void
     {
-        $this->ConnectContainerIdToNetwork($container->GetIdentifier(), $container->GetInternalPort());
+        if ($container->GetIdentifier() !== 'nextcloud-aio-docker-socket-proxy') {
+            $this->ConnectContainerIdToNetwork($container->GetIdentifier(), $container->GetInternalPort());
+        }
         if ($container->GetIdentifier() === 'nextcloud-aio-nextcloud' || $container->GetIdentifier() === 'nextcloud-aio-docker-socket-proxy') {
             $this->ConnectContainerIdToNetwork($container->GetIdentifier(), $container->GetInternalPort(), 'nextcloud-aio-docker-socket-proxy-network');
         }