Skip to content

Commit d1cba32

Browse files
bohdan-shulhabohdan-shulha
committed
fix: #256 try shorter container names
1 parent 472e1bb commit d1cba32

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

‎_ide_helper_actions.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ class RebuildCaddy {}
5757
*/
5858
class CreateService {}
5959
/**
60-
* @method static \Lorisleiva\Actions\Decorators\JobDecorator|\Lorisleiva\Actions\Decorators\UniqueJobDecorator makeJob(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
61-
* @method static \Lorisleiva\Actions\Decorators\UniqueJobDecorator makeUniqueJob(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
62-
* @method static \Illuminate\Foundation\Bus\PendingDispatch dispatch(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
63-
* @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchIf(bool $boolean, \App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
64-
* @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchUnless(bool $boolean, \App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
65-
* @method static dispatchSync(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
66-
* @method static dispatchNow(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
67-
* @method static dispatchAfterResponse(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
68-
* @method static \App\Models\Deployment run(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, mixed $reviewAppId = null)
60+
* @method static \Lorisleiva\Actions\Decorators\JobDecorator|\Lorisleiva\Actions\Decorators\UniqueJobDecorator makeJob(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
61+
* @method static \Lorisleiva\Actions\Decorators\UniqueJobDecorator makeUniqueJob(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
62+
* @method static \Illuminate\Foundation\Bus\PendingDispatch dispatch(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
63+
* @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchIf(bool $boolean, \App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
64+
* @method static \Illuminate\Foundation\Bus\PendingDispatch|\Illuminate\Support\Fluent dispatchUnless(bool $boolean, \App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
65+
* @method static dispatchSync(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
66+
* @method static dispatchNow(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
67+
* @method static dispatchAfterResponse(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
68+
* @method static \App\Models\Deployment run(\App\Models\NodeTaskGroup $taskGroup, \App\Models\Service $service, \App\Models\DeploymentData $deploymentData, ?\App\Models\ReviewApp $reviewApp = null)
6969
*/
7070
class StartDeployment {}
7171

‎app/Actions/Services/StartDeployment.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use App\Models\DeploymentData;
88
use App\Models\NodeTaskGroup;
99
use App\Models\NodeTaskGroupType;
10+
use App\Models\ReviewApp;
1011
use App\Models\Service;
1112
use Illuminate\Support\Facades\DB;
1213
use Illuminate\Support\Facades\Request;
@@ -28,16 +29,16 @@ public function authorize(ActionRequest $request): bool
2829
return true;
2930
}
3031

31-
public function handle(NodeTaskGroup $taskGroup, Service $service, DeploymentData $deploymentData, $reviewAppId = null): Deployment
32+
public function handle(NodeTaskGroup $taskGroup, Service $service, DeploymentData $deploymentData, ?ReviewApp $reviewApp = null): Deployment
3233
{
3334
$taskGroup->team->quotas()->deployments->ensureQuota();
3435

35-
return DB::transaction(function () use ($taskGroup, $service, $deploymentData, $reviewAppId) {
36+
return DB::transaction(function () use ($taskGroup, $service, $deploymentData, $reviewApp) {
3637
$deployment = $service->deployments()->create([
3738
'team_id' => $service->team_id,
3839
'data' => $deploymentData,
3940
'configured_by_id' => $taskGroup->invoker_id,
40-
'review_app_id' => $reviewAppId,
41+
'review_app_id' => $reviewApp?->id,
4142
]);
4243

4344
$deployment->taskGroups()->attach($taskGroup);

‎app/Models/DeploymentData/Worker.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ public function asNodeTasks(Deployment $deployment, Process $process, bool $buil
197197
'Networks' => [
198198
[
199199
'Target' => $deployment->data->networkName,
200-
'Aliases' => [
200+
'Aliases' => array_unique([
201201
$internalDomain,
202202
$hostname,
203-
],
203+
]),
204204
],
205205
],
206206
],
@@ -397,7 +397,10 @@ protected function getPullImageTasks(Deployment $deployment, Process $process):
397397

398398
private function getInternalDomain(Deployment $deployment, Process $process): string
399399
{
400-
$base = $process->getInternalDomain($deployment);
400+
$base = $deployment->reviewApp
401+
? "{$deployment->reviewApp->ref}.{$process->getInternalDomain($deployment)}"
402+
: $process->getInternalDomain($deployment);
403+
401404
if ($this->name === 'main') {
402405
return $base;
403406
}
@@ -407,7 +410,7 @@ private function getInternalDomain(Deployment $deployment, Process $process): st
407410

408411
private function getHostname(Deployment $deployment, Process $process): string
409412
{
410-
return "dpl-{$deployment->id}.{$this->name}.{$process->getInternalDomain($deployment)}";
413+
return 'dpl-'.$deployment->id.'.'.$this->getInternalDomain($deployment, $process);
411414
}
412415

413416
private function getMounts(Deployment $deployment, Process $process, array $labels): array

‎bootstrap/helpers.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ function dockerize_name(string $name): string
2828
$name = Str::replaceMatches('/\W/', '_', $name);
2929
$name = Str::replaceMatches('/_+/', '_', $name);
3030

31-
if (Str::length($name) > 63) {
32-
$name = Str::substr($name, 0, 57).'_'.Str::random(5);
31+
if (Str::length($name) > 60) {
32+
$name = Str::substr($name, 0, 55).'_'.Str::random(5);
3333
}
3434

3535
return Str::lower($name);

0 commit comments

Comments
 (0)