eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-16 18:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #3242 from nextcloud/enh/noid/improve-dsp

Browse source
This commit is contained in:
Simon L 2023-08-24 16:26:19 +02:00 • committed by GitHub
commit df92e707e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Containers/docker-socket-proxy/Dockerfile
View file

@ -26,7 +26,7 @@ ENV ALLOW_RESTARTS=1 \
NODES=0 \ NODES=0 \
PING=1 \ PING=1 \
PLUGINS=0 \ PLUGINS=0 \
POST=0 \ POST=1 \
SECRETS=0 \ SECRETS=0 \
SERVICES=0 \ SERVICES=0 \
SESSION=0 \ SESSION=0 \
@ -39,3 +39,5 @@ ENV ALLOW_RESTARTS=1 \
COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg
USER haproxy:root USER haproxy:root
HEALTHCHECK CMD nc -z 127.0.0.1 2375 || exit 1

2
Containers/docker-socket-proxy/haproxy.cfg
View file

@ -7,7 +7,7 @@ global
maxconn 4000 maxconn 4000
# Turn on stats unix socket # Turn on stats unix socket
server-state-file /var/lib/haproxy/server-state # server-state-file /var/lib/haproxy/server-state
defaults defaults
mode http mode http

4
php/src/Docker/DockerActionManager.php
View file

@ -831,7 +831,9 @@ class DockerActionManager
public function ConnectContainerToNetwork(Container $container) : void 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') { 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'); $this->ConnectContainerIdToNetwork($container->GetIdentifier(), $container->GetInternalPort(), 'nextcloud-aio-docker-socket-proxy-network');
} }