Fix: Fragile service name parsing with hyphens (#7399)

This commit is contained in:
Andras Bacsai authored and GitHub committed 2025-11-28 17:50:44 +01:00
commit a25e553f88
10 files changed
+236 -33

No files matched your search

@@ -1652,6 +1652,10 @@ class ApplicationsController extends Controller
$service->save();
$service->parse(isNew: true);
// Apply service-specific application prerequisites
applyServiceApplicationPrerequisites($service);
if ($instantDeploy) {
StartService::dispatch($service);
}
@@ -376,6 +376,10 @@ class ServicesController extends Controller
});
}
$service->parse(isNew: true);
// Apply service-specific application prerequisites
applyServiceApplicationPrerequisites($service);
if ($instantDeploy) {
StartService::dispatch($service);
}
@@ -74,6 +74,9 @@ class DockerCompose extends Component
}
$service->parse(isNew: true);
// Apply service-specific application prerequisites
applyServiceApplicationPrerequisites($service);
return redirect()->route('project.service.configuration', [
'service_uuid' => $service->uuid,
'environment_uuid' => $environment->uuid,
+8 -25
View File
@@ -102,33 +102,16 @@ class Create extends Component
}
});
}
$service->parse(isNew: true);
$service->parse(isNew: true);
// For Beszel service disable gzip (fixes realtime not working issue)
if ($oneClickServiceName === 'beszel') {
$appService = $service->applications()->whereName('beszel')->first();
if ($appService) {
$appService->is_gzip_enabled = false;
$appService->save();
}
}
// For Appwrite services, disable strip prefix for services that handle domain requests
if ($oneClickServiceName === 'appwrite') {
$servicesToDisableStripPrefix = ['appwrite', 'appwrite-console', 'appwrite-realtime'];
foreach ($servicesToDisableStripPrefix as $serviceName) {
$appService = $service->applications()->whereName($serviceName)->first();
if ($appService) {
$appService->is_stripprefix_enabled = false;
$appService->save();
}
}
}
// Apply service-specific application prerequisites
applyServiceApplicationPrerequisites($service);
return redirect()->route('project.service.configuration', [
'service_uuid' => $service->uuid,
'environment_uuid' => $environment->uuid,
'project_uuid' => $project->uuid,
]);
return redirect()->route('project.service.configuration', [
'service_uuid' => $service->uuid,
'environment_uuid' => $environment->uuid,
'project_uuid' => $project->uuid,
]);
}
}
$this->type = $type->value();
+1 -1
View File
@@ -92,7 +92,7 @@ class Proxy extends Component
public function getConfigurationFilePathProperty(): string
{
return rtrim($this->server->proxyPath(), '/') . '/docker-compose.yml';
return rtrim($this->server->proxyPath(), '/').'/docker-compose.yml';
}
public function changeProxy()