fix(parsers): replace hyphens with underscores in service names for consistency. this allows to properly parse custom domains in docker compose based applications
This commit is contained in:
parent
b119d4f95c
commit
4a1eb064a4
1 changed files with 2 additions and 0 deletions
|
|
@ -640,6 +640,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int
|
||||||
if ($resource->build_pack !== 'dockercompose') {
|
if ($resource->build_pack !== 'dockercompose') {
|
||||||
$domains = collect([]);
|
$domains = collect([]);
|
||||||
}
|
}
|
||||||
|
$serviceName = str($serviceName)->replace('-', '_')->value();
|
||||||
$fqdns = data_get($domains, "$serviceName.domain");
|
$fqdns = data_get($domains, "$serviceName.domain");
|
||||||
// Generate SERVICE_FQDN & SERVICE_URL for dockercompose
|
// Generate SERVICE_FQDN & SERVICE_URL for dockercompose
|
||||||
if ($resource->build_pack === 'dockercompose') {
|
if ($resource->build_pack === 'dockercompose') {
|
||||||
|
|
@ -1655,6 +1656,7 @@ function serviceParser(Service $resource): Collection
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$serviceName = str($serviceName)->replace('-', '_')->value();
|
||||||
if (! $isDatabase && $fqdns instanceof Collection && $fqdns->count() > 0) {
|
if (! $isDatabase && $fqdns instanceof Collection && $fqdns->count() > 0) {
|
||||||
$shouldGenerateLabelsExactly = $resource->server->settings->generate_exact_labels;
|
$shouldGenerateLabelsExactly = $resource->server->settings->generate_exact_labels;
|
||||||
$uuid = $resource->uuid;
|
$uuid = $resource->uuid;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue