From 387a093f0485e4356bcaec3fe5ea27a8ef177ddc Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Wed, 3 Dec 2025 16:30:27 +0100
Subject: [PATCH] Fix container name conflict during proxy restart
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The error "container name already in use" occurred because the container
wasn't fully removed before docker compose up tried to create a new one.

Changes:
- Removed redundant stop/remove logic from START PHASE (was duplicating STOP PHASE)
- Made STOP PHASE more robust:
  - Increased wait iterations from 10 to 15
  - Added force remove on each iteration in case container got stuck
  - Added final verification and force cleanup after the loop
  - Added better logging to show removal progress

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 app/Jobs/RestartProxyJob.php | 38 ++++++++++++++++--------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/app/Jobs/RestartProxyJob.php b/app/Jobs/RestartProxyJob.php
index e4bd8d47e..2815c73bc 100644
--- a/app/Jobs/RestartProxyJob.php
+++ b/app/Jobs/RestartProxyJob.php
@@ -97,29 +97,39 @@ private function buildRestartCommands(): array
 
         // === STOP PHASE ===
         $commands = $commands->merge([
-            "echo '>>> Stopping proxy...'",
+            "echo 'Stopping proxy...'",
             "docker stop -t=$stopTimeout $containerName 2>/dev/null || true",
             "docker rm -f $containerName 2>/dev/null || true",
             '# Wait for container to be fully removed',
-            'for i in {1..10}; do',
+            'for i in {1..15}; do',
             "    if ! docker ps -a --format \"{{.Names}}\" | grep -q \"^$containerName$\"; then",
+            "        echo 'Container removed successfully.'",
             '        break',
             '    fi',
+            '    echo "Waiting for container to be removed... ($i/15)"',
             '    sleep 1',
+            '    # Force remove on each iteration in case it got stuck',
+            "    docker rm -f $containerName 2>/dev/null || true",
             'done',
-            "echo '>>> Proxy stopped successfully.'",
+            '# Final verification and force cleanup',
+            "if docker ps -a --format \"{{.Names}}\" | grep -q \"^$containerName$\"; then",
+            "    echo 'Container still exists after wait, forcing removal...'",
+            "    docker rm -f $containerName 2>/dev/null || true",
+            '    sleep 2',
+            'fi',
+            "echo 'Proxy stopped successfully.'",
         ]);
 
         // === START PHASE ===
         if ($this->server->isSwarmManager()) {
             $commands = $commands->merge([
-                "echo '>>> Starting proxy (Swarm mode)...'",
+                "echo 'Starting proxy (Swarm mode)...'",
                 "mkdir -p $proxy_path/dynamic",
                 "cd $proxy_path",
                 "echo 'Creating required Docker Compose file.'",
                 "echo 'Starting coolify-proxy.'",
                 'docker stack deploy --detach=true -c docker-compose.yml coolify-proxy',
-                "echo '>>> Successfully started coolify-proxy.'",
+                "echo 'Successfully started coolify-proxy.'",
             ]);
         } else {
             if (isDev() && $proxyType === ProxyTypes::CADDY->value) {
@@ -127,34 +137,20 @@ private function buildRestartCommands(): array
             }
             $caddyfile = 'import /dynamic/*.caddy';
             $commands = $commands->merge([
-                "echo '>>> Starting proxy...'",
+                "echo 'Starting proxy...'",
                 "mkdir -p $proxy_path/dynamic",
                 "cd $proxy_path",
                 "echo '$caddyfile' > $proxy_path/dynamic/Caddyfile",
                 "echo 'Creating required Docker Compose file.'",
                 "echo 'Pulling docker image.'",
                 'docker compose pull',
-                'if docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
-                "    echo 'Stopping and removing existing coolify-proxy.'",
-                '    docker stop coolify-proxy 2>/dev/null || true',
-                '    docker rm -f coolify-proxy 2>/dev/null || true',
-                '    # Wait for container to be fully removed',
-                '    for i in {1..10}; do',
-                '        if ! docker ps -a --format "{{.Names}}" | grep -q "^coolify-proxy$"; then',
-                '            break',
-                '        fi',
-                '        echo "Waiting for coolify-proxy to be removed... ($i/10)"',
-                '        sleep 1',
-                '    done',
-                "    echo 'Successfully stopped and removed existing coolify-proxy.'",
-                'fi',
             ]);
             // Ensure required networks exist BEFORE docker compose up
             $commands = $commands->merge(ensureProxyNetworksExist($this->server));
             $commands = $commands->merge([
                 "echo 'Starting coolify-proxy.'",
                 'docker compose up -d --wait --remove-orphans',
-                "echo '>>> Successfully started coolify-proxy.'",
+                "echo 'Successfully started coolify-proxy.'",
             ]);
             $commands = $commands->merge(connectProxyToNetworks($this->server));
         }