dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat: image tag for services

Browse Source
This commit is contained in:
Andras Bacsai
2023-09-25 17:51:04 +02:00
parent 0f8ccac775
commit 0fbc382467
7 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Livewire/Project/Service/Application.php
View File

@@ -15,6 +15,7 @@ class Application extends Component
'application.human_name' => 'nullable',
'application.description' => 'nullable',
'application.fqdn' => 'nullable',
'application.image_tag' => 'required',
'application.ignore_from_status' => 'required|boolean',
];
public function render()

2
app/Http/Livewire/Project/Service/Database.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Livewire\Project\Service;
use App\Models\ServiceApplication;
use App\Models\ServiceDatabase;
use Livewire\Component;
@@ -12,6 +11,7 @@ class Database extends Component
protected $rules = [
'database.human_name' => 'nullable',
'database.description' => 'nullable',
'database.image_tag' => 'required',
'database.ignore_from_status' => 'required|boolean',
];

7
app/Models/Service.php
View File

@@ -139,6 +139,7 @@ class Service extends BaseModel
$image = data_get($service, 'image');
if ($image) {
$imageName = Str::of($image)->before(':');
$imageTag = Str::of($image)->after(':') ?? 'latest';
if (collect(DATABASE_DOCKER_IMAGES)->contains($imageName)) {
$isDatabase = true;
data_set($service, 'is_database', true);
@@ -159,12 +160,14 @@ class Service extends BaseModel
if ($isDatabase) {
$savedService = ServiceDatabase::create([
'name' => $serviceName,
'image_tag' => $imageTag,
'service_id' => $this->id
]);
} else {
$savedService = ServiceApplication::create([
'name' => $serviceName,
'fqdn' => $this->generateFqdn($serviceVariables, $serviceName),
'image_tag' => $imageTag,
'service_id' => $this->id
]);
}
@@ -182,6 +185,8 @@ class Service extends BaseModel
$savedService->save();
}
}
// Set image tag
$fqdns = data_get($savedService, 'fqdn');
if ($fqdns) {
$fqdns = collect(Str::of($fqdns)->explode(','));
@@ -495,6 +500,8 @@ class Service extends BaseModel
$labels = $labels->merge(fqdnLabelsForTraefik($fqdns, $container_name, true));
}
}
data_set($service, 'labels', $labels->toArray());
data_forget($service, 'is_database');
data_set($service, 'restart', RESTART_MODE);