tiennm99/coolify
1
0
Fork 0
mirror of https://github.com/tiennm99/coolify.git synced 2026-04-17 17:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix container name conflict during proxy restart

Browse Source 
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>
This commit is contained in:
Andras Bacsai
2025-12-03 16:30:27 +01:00
parent 36da7174d5
commit 387a093f04
1 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Jobs/RestartProxyJob.php
View File

@@ -97,29 +97,39 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
// === STOP PHASE === // === STOP PHASE ===
$commands = $commands->merge([ $commands = $commands->merge([
"echo '>>> Stopping proxy...'", "echo 'Stopping proxy...'",
"docker stop -t=$stopTimeout $containerName 2>/dev/null || true", "docker stop -t=$stopTimeout $containerName 2>/dev/null || true",
"docker rm -f $containerName 2>/dev/null || true", "docker rm -f $containerName 2>/dev/null || true",
'# Wait for container to be fully removed', '# 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", " if ! docker ps -a --format \"{{.Names}}\" | grep -q \"^$containerName$\"; then",
" echo 'Container removed successfully.'",
' break', ' break',
' fi', ' fi',
' echo "Waiting for container to be removed... ($i/15)"',
' sleep 1', ' sleep 1',
' # Force remove on each iteration in case it got stuck',
" docker rm -f $containerName 2>/dev/null || true",
'done', '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 === // === START PHASE ===
if ($this->server->isSwarmManager()) { if ($this->server->isSwarmManager()) {
$commands = $commands->merge([ $commands = $commands->merge([
"echo '>>> Starting proxy (Swarm mode)...'", "echo 'Starting proxy (Swarm mode)...'",
"mkdir -p $proxy_path/dynamic", "mkdir -p $proxy_path/dynamic",
"cd $proxy_path", "cd $proxy_path",
"echo 'Creating required Docker Compose file.'", "echo 'Creating required Docker Compose file.'",
"echo 'Starting coolify-proxy.'", "echo 'Starting coolify-proxy.'",
'docker stack deploy --detach=true -c docker-compose.yml coolify-proxy', 'docker stack deploy --detach=true -c docker-compose.yml coolify-proxy',
"echo '>>> Successfully started coolify-proxy.'", "echo 'Successfully started coolify-proxy.'",
]); ]);
} else { } else {
if (isDev() && $proxyType === ProxyTypes::CADDY->value) { if (isDev() && $proxyType === ProxyTypes::CADDY->value) {
@@ -127,34 +137,20 @@ class RestartProxyJob implements ShouldBeEncrypted, ShouldQueue
} }
$caddyfile = 'import /dynamic/*.caddy'; $caddyfile = 'import /dynamic/*.caddy';
$commands = $commands->merge([ $commands = $commands->merge([
"echo '>>> Starting proxy...'", "echo 'Starting proxy...'",
"mkdir -p $proxy_path/dynamic", "mkdir -p $proxy_path/dynamic",
"cd $proxy_path", "cd $proxy_path",
"echo '$caddyfile' > $proxy_path/dynamic/Caddyfile", "echo '$caddyfile' > $proxy_path/dynamic/Caddyfile",
"echo 'Creating required Docker Compose file.'", "echo 'Creating required Docker Compose file.'",
"echo 'Pulling docker image.'", "echo 'Pulling docker image.'",
'docker compose pull', '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 // Ensure required networks exist BEFORE docker compose up
$commands = $commands->merge(ensureProxyNetworksExist($this->server)); $commands = $commands->merge(ensureProxyNetworksExist($this->server));
$commands = $commands->merge([ $commands = $commands->merge([
"echo 'Starting coolify-proxy.'", "echo 'Starting coolify-proxy.'",
'docker compose up -d --wait --remove-orphans', 'docker compose up -d --wait --remove-orphans',
"echo '>>> Successfully started coolify-proxy.'", "echo 'Successfully started coolify-proxy.'",
]); ]);
$commands = $commands->merge(connectProxyToNetworks($this->server)); $commands = $commands->merge(connectProxyToNetworks($this->server));
} }