fix: new volumes for services should have - instead of _
This commit is contained in:
parent
d523becb29
commit
5d6ee04991
@ -248,7 +248,7 @@ class Service extends BaseModel
|
|||||||
|
|
||||||
// Collect/create/update volumes
|
// Collect/create/update volumes
|
||||||
if ($serviceVolumes->count() > 0) {
|
if ($serviceVolumes->count() > 0) {
|
||||||
$serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes) {
|
$serviceVolumes = $serviceVolumes->map(function ($volume) use ($savedService, $topLevelVolumes, $isNew) {
|
||||||
$type = null;
|
$type = null;
|
||||||
$source = null;
|
$source = null;
|
||||||
$target = null;
|
$target = null;
|
||||||
@ -298,7 +298,11 @@ class Service extends BaseModel
|
|||||||
);
|
);
|
||||||
} else if ($type->value() === 'volume') {
|
} else if ($type->value() === 'volume') {
|
||||||
$slug = Str::slug($source, '-');
|
$slug = Str::slug($source, '-');
|
||||||
|
if ($isNew) {
|
||||||
|
$name = "{$savedService->service->uuid}-{$slug}";
|
||||||
|
} else {
|
||||||
$name = "{$savedService->service->uuid}_{$slug}";
|
$name = "{$savedService->service->uuid}_{$slug}";
|
||||||
|
}
|
||||||
if (is_string($volume)) {
|
if (is_string($volume)) {
|
||||||
$source = Str::of($volume)->before(':');
|
$source = Str::of($volume)->before(':');
|
||||||
$target = Str::of($volume)->after(':')->beforeLast(':');
|
$target = Str::of($volume)->after(':')->beforeLast(':');
|
||||||
@ -323,8 +327,6 @@ class Service extends BaseModel
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
$savedService->getFilesFromServer();
|
$savedService->getFilesFromServer();
|
||||||
ray($volume);
|
|
||||||
|
|
||||||
return $volume;
|
return $volume;
|
||||||
});
|
});
|
||||||
data_set($service, 'volumes', $serviceVolumes->toArray());
|
data_set($service, 'volumes', $serviceVolumes->toArray());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user