7a16938f0c
Add wait loops to ensure containers are fully removed before restarting. This fixes race conditions where docker compose would fail because an existing container was still being cleaned up. Changes: - StartProxy: Add explicit stop, wait loop before docker compose up - StopProxy: Add wait loop after container removal - Both actions now poll up to 10 seconds for complete removal - Add error suppression to handle non-existent containers gracefully Tests: - Add StartProxyTest.php with 3 tests for cleanup logic - Add StopProxyTest.php with 4 tests for stop behavior 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
97 lines
3.8 KiB
PHP
97 lines
3.8 KiB
PHP
<?php
|
|
|
|
namespace App\Actions\Proxy;
|
|
|
|
use App\Enums\ProxyTypes;
|
|
use App\Events\ProxyStatusChanged;
|
|
use App\Events\ProxyStatusChangedUI;
|
|
use App\Models\Server;
|
|
use Lorisleiva\Actions\Concerns\AsAction;
|
|
use Spatie\Activitylog\Models\Activity;
|
|
|
|
class StartProxy
|
|
{
|
|
use AsAction;
|
|
|
|
public function handle(Server $server, bool $async = true, bool $force = false, bool $restarting = false): string|Activity
|
|
{
|
|
$proxyType = $server->proxyType();
|
|
if ((is_null($proxyType) || $proxyType === 'NONE' || $server->proxy->force_stop || $server->isBuildServer()) && $force === false) {
|
|
return 'OK';
|
|
}
|
|
$server->proxy->set('status', 'starting');
|
|
$server->save();
|
|
$server->refresh();
|
|
|
|
if (! $restarting) {
|
|
ProxyStatusChangedUI::dispatch($server->team_id);
|
|
}
|
|
|
|
$commands = collect([]);
|
|
$proxy_path = $server->proxyPath();
|
|
$configuration = GetProxyConfiguration::run($server);
|
|
if (! $configuration) {
|
|
throw new \Exception('Configuration is not synced');
|
|
}
|
|
SaveProxyConfiguration::run($server, $configuration);
|
|
$docker_compose_yml_base64 = base64_encode($configuration);
|
|
$server->proxy->last_applied_settings = str($docker_compose_yml_base64)->pipe('md5')->value();
|
|
$server->save();
|
|
|
|
if ($server->isSwarmManager()) {
|
|
$commands = $commands->merge([
|
|
"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.'",
|
|
]);
|
|
} else {
|
|
if (isDev()) {
|
|
if ($proxyType === ProxyTypes::CADDY->value) {
|
|
$proxy_path = '/data/coolify/proxy/caddy';
|
|
}
|
|
}
|
|
$caddyfile = 'import /dynamic/*.caddy';
|
|
$commands = $commands->merge([
|
|
"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',
|
|
"echo 'Starting coolify-proxy.'",
|
|
'docker compose up -d --wait --remove-orphans',
|
|
"echo 'Successfully started coolify-proxy.'",
|
|
]);
|
|
$commands = $commands->merge(connectProxyToNetworks($server));
|
|
}
|
|
|
|
if ($async) {
|
|
return remote_process($commands, $server, callEventOnFinish: 'ProxyStatusChanged', callEventData: $server->id);
|
|
} else {
|
|
instant_remote_process($commands, $server);
|
|
|
|
$server->proxy->set('type', $proxyType);
|
|
$server->save();
|
|
ProxyStatusChanged::dispatch($server->id);
|
|
|
|
return 'OK';
|
|
}
|
|
}
|
|
}
|