Compare commits

...

6 Commits

Author SHA1 Message Date
Andras Bacsai
c8b974820b Merge pull request #1282 from coollabsio/next
fix: volume names
2023-10-03 13:26:02 +02:00
Andras Bacsai
527373e297 fix: volume names 2023-10-03 13:25:41 +02:00
Andras Bacsai
a84be8dc33 Merge pull request #1281 from coollabsio/next
v4.0.0-beta.61
2023-10-03 13:14:39 +02:00
Andras Bacsai
bd856f7f67 fix: volume names in services 2023-10-03 13:14:11 +02:00
Andras Bacsai
8ff216e5fb revert 2023-10-03 12:20:09 +02:00
Andras Bacsai
5255311a2e hmm 2023-10-03 12:14:58 +02:00
4 changed files with 8 additions and 6 deletions

View File

@@ -318,8 +318,8 @@ class Service extends BaseModel
] ]
); );
} else if ($type->value() === 'volume') { } else if ($type->value() === 'volume') {
$slug = Str::slug($source, '-'); $slugWithoutUuid = Str::slug($source, '-');
$name = "{$savedService->service->uuid}_{$slug}"; $name = "{$savedService->service->uuid}_{$slugWithoutUuid}";
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(':');
@@ -328,7 +328,9 @@ class Service extends BaseModel
} else if (is_array($volume)) { } else if (is_array($volume)) {
data_set($volume, 'source', $name); data_set($volume, 'source', $name);
} }
$topLevelVolumes->put($name, null); $topLevelVolumes->put($name, [
'name' => $name,
]);
LocalPersistentVolume::updateOrCreate( LocalPersistentVolume::updateOrCreate(
[ [
'mount_path' => $target, 'mount_path' => $target,

View File

@@ -7,7 +7,7 @@ return [
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.60', 'release' => '4.0.0-beta.62',
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

View File

@@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.60'; return '4.0.0-beta.62';

View File

@@ -4,7 +4,7 @@
"version": "3.12.36" "version": "3.12.36"
}, },
"v4": { "v4": {
"version": "4.0.0-beta.60" "version": "4.0.0-beta.62"
} }
} }
} }