Remove mastercontainer connection to APACHE_ADDITIONAL_CONTAINER. Fol…

…low that up in a separate PR. Signed-off-by: Apoorv Parle <[email protected]>
nextcloud · Nov 7, 2024 · e30b456 · e30b456
1 parent 974ad1e
commit e30b456
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/Containers/mastercontainer/start.sh b/Containers/mastercontainer/start.sh
@@ -200,11 +200,6 @@ It needs to be a string with letters, numbers, hyphens and underscores.
 It is set to '$APACHE_ADDITIONAL_NETWORK'."
         exit 1
     fi
-    tmp_out=$(sudo -u www-data docker network connect $APACHE_ADDITIONAL_NETWORK nextcloud-aio-mastercontainer 2>&1)
-    if [ -n "$tmp_out" ] && [[ ! "$tmp_out" =~ "nextcloud-aio-mastercontainer already exists in network $APACHE_ADDITIONAL_NETWORK" ]]; then
-        print_red "Unable to connect to $APACHE_ADDITIONAL_NETWORK. Cannot continue. Error: \n $tmp_out"
-        exit 1
-    fi
 fi
 if [ -n "$TALK_PORT" ]; then
     if ! check_if_number "$TALK_PORT"; then

diff --git a/php/src/Docker/DockerActionManager.php b/php/src/Docker/DockerActionManager.php
@@ -902,11 +902,6 @@ public function ConnectMasterContainerToNetwork() : void
         $this->ConnectContainerIdToNetwork('nextcloud-aio-mastercontainer', '');
         // Don't disconnect here since it slows down the initial login by a lot. Is getting done during cron.sh instead.
         // $this->DisconnectContainerFromBridgeNetwork('nextcloud-aio-mastercontainer');
-
-        $apacheAdditionalNetwork = $this->configurationManager->GetApacheAdditionalNetwork();
-        if ($apacheAdditionalNetwork !== '') {
-            $this->ConnectContainerIdToNetwork('nextcloud-aio-mastercontainer', '', $apacheAdditionalNetwork, false);
-        }
     }
 
     public function ConnectContainerToNetwork(Container $container) : void