diff --git a/app/Http/Livewire/Project/Application/General.php b/app/Http/Livewire/Project/Application/General.php index dc3bd8db6..c99650912 100644 --- a/app/Http/Livewire/Project/Application/General.php +++ b/app/Http/Livewire/Project/Application/General.php @@ -3,12 +3,9 @@ namespace App\Http\Livewire\Project\Application; use App\Models\Application; -use App\Models\InstanceSettings; use Illuminate\Support\Collection; use Illuminate\Support\Str; use Livewire\Component; -use Spatie\Url\Url; -use Symfony\Component\Yaml\Yaml; class General extends Component { @@ -23,6 +20,10 @@ class General extends Component public ?string $git_commit_sha = null; public string $build_pack; + public $customLabels; + public bool $labelsChanged = false; + public bool $isConfigurationChanged = false; + public bool $is_static; public bool $is_git_submodules_enabled; public bool $is_git_lfs_enabled; @@ -52,6 +53,7 @@ class General extends Component 'application.docker_registry_image_name' => 'nullable', 'application.docker_registry_image_tag' => 'nullable', 'application.dockerfile_location' => 'nullable', + 'application.custom_labels' => 'nullable', ]; protected $validationAttributes = [ 'application.name' => 'name', @@ -73,16 +75,47 @@ class General extends Component 'application.docker_registry_image_name' => 'Docker registry image name', 'application.docker_registry_image_tag' => 'Docker registry image tag', 'application.dockerfile_location' => 'Dockerfile location', - + 'application.custom_labels' => 'Custom labels', ]; - public function updatedApplicationBuildPack(){ + public function mount() + { + if (str($this->application->status)->startsWith('running') && is_null($this->application->config_hash)) { + $this->application->isConfigurationChanged(true); + } + $this->isConfigurationChanged = $this->application->isConfigurationChanged(); + if (is_null(data_get($this->application, 'custom_labels'))) { + $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n"); + } else { + $this->customLabels = str($this->application->custom_labels)->replace(',', "\n"); + } + if (data_get($this->application, 'settings')) { + $this->is_static = $this->application->settings->is_static; + $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled; + $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled; + $this->is_debug_enabled = $this->application->settings->is_debug_enabled; + $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled; + $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled; + $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled; + } + $this->checkLabelUpdates(); + } + public function updatedApplicationBuildPack() + { if ($this->application->build_pack !== 'nixpacks') { $this->application->settings->is_static = $this->is_static = false; $this->application->settings->save(); } $this->submit(); } + public function checkLabelUpdates() + { + if (md5($this->application->custom_labels) !== md5(implode(",", generateLabelsApplication($this->application)))) { + $this->labelsChanged = true; + } else { + $this->labelsChanged = false; + } + } public function instantSave() { // @TODO: find another way - if possible @@ -102,37 +135,36 @@ class General extends Component $this->application->save(); $this->application->refresh(); $this->emit('success', 'Application settings updated!'); + $this->checkLabelUpdates(); + $this->isConfigurationChanged = $this->application->isConfigurationChanged(); } - public function getWildcardDomain() { + public function getWildcardDomain() + { $server = data_get($this->application, 'destination.server'); if ($server) { $fqdn = generateFqdn($server, $this->application->uuid); - ray($fqdn); $this->application->fqdn = $fqdn; $this->application->save(); $this->emit('success', 'Application settings updated!'); } - } - public function mount() + public function resetDefaultLabels($showToaster = true) { - if (data_get($this->application,'settings')) { - $this->is_static = $this->application->settings->is_static; - $this->is_git_submodules_enabled = $this->application->settings->is_git_submodules_enabled; - $this->is_git_lfs_enabled = $this->application->settings->is_git_lfs_enabled; - $this->is_debug_enabled = $this->application->settings->is_debug_enabled; - $this->is_preview_deployments_enabled = $this->application->settings->is_preview_deployments_enabled; - $this->is_auto_deploy_enabled = $this->application->settings->is_auto_deploy_enabled; - $this->is_force_https_enabled = $this->application->settings->is_force_https_enabled; - } + $this->customLabels = str(implode(",", generateLabelsApplication($this->application)))->replace(',', "\n"); + $this->submit($showToaster); } - public function submit() + public function updatedApplicationFqdn() + { + $this->resetDefaultLabels(false); + $this->emit('success', 'Labels reseted to default!'); + } + public function submit($showToaster = true) { try { $this->validate(); - if (data_get($this->application,'build_pack') === 'dockerimage') { + if (data_get($this->application, 'build_pack') === 'dockerimage') { $this->validate([ 'application.docker_registry_image_name' => 'required', 'application.docker_registry_image_tag' => 'required', @@ -156,10 +188,17 @@ class General extends Component if ($this->application->publish_directory && $this->application->publish_directory !== '/') { $this->application->publish_directory = rtrim($this->application->publish_directory, '/'); } + if (gettype($this->customLabels) === 'string') { + $this->customLabels = str($this->customLabels)->replace(',', "\n"); + } + $this->application->custom_labels = $this->customLabels->explode("\n")->implode(','); $this->application->save(); - $this->emit('success', 'Application settings updated!'); + $showToaster && $this->emit('success', 'Application settings updated!'); } catch (\Throwable $e) { return handleError($e, $this); + } finally { + $this->checkLabelUpdates(); + $this->isConfigurationChanged = $this->application->isConfigurationChanged(); } } } diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 09e7c510d..a6d6050bf 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -54,7 +54,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted private ApplicationPreview|null $preview = null; private string $container_name; - private string|null $currently_running_container_name = null; + private ?string $currently_running_container_name = null; private string $basedir; private string $workdir; private ?string $build_pack = null; @@ -78,7 +78,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted public $tries = 1; public function __construct(int $application_deployment_queue_id) { - ray()->clearScreen(); + // ray()->clearScreen(); $this->application_deployment_queue = ApplicationDeploymentQueue::find($application_deployment_queue_id); $this->log_model = $this->application_deployment_queue; $this->application = Application::find($this->application_deployment_queue->application_id); @@ -166,7 +166,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted // Get user home directory $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server); - ray("test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"); $this->dockerConfigFileExists = instant_remote_process(["test -f {$this->serverUserHomeDir}/.docker/config.json && echo 'OK' || echo 'NOK'"], $this->server); try { if ($this->application->dockerfile) { @@ -186,6 +185,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted dispatch(new ContainerStatusJob($this->server)); } $this->next(ApplicationDeploymentStatus::FINISHED->value); + $this->application->isConfigurationChanged(true); } catch (Exception $e) { ray($e); $this->fail($e); @@ -354,14 +354,19 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted $this->execute_remote_command([ "docker images -q {$this->production_image_name} 2>/dev/null", "hidden" => true, "save" => "local_image_found" ]); - if (Str::of($this->saved_outputs->get('local_image_found'))->isNotEmpty()) { + if (Str::of($this->saved_outputs->get('local_image_found'))->isNotEmpty() && !$this->application->isConfigurationChanged()) { $this->execute_remote_command([ - "echo 'Docker Image found locally with the same Git Commit SHA {$this->application->uuid}:{$this->commit}. Build step skipped...'" + "echo 'No configuration changed & Docker Image found locally with the same Git Commit SHA {$this->application->uuid}:{$this->commit}. Build step skipped.'", ]); $this->generate_compose_file(); $this->rolling_update(); return; } + if ($this->application->isConfigurationChanged()) { + $this->execute_remote_command([ + "echo 'Configuration changed. Rebuilding image.'", + ]); + } } $this->cleanup_git(); $this->generate_nixpacks_confs(); @@ -650,6 +655,10 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted $volume_names = $this->generate_local_persistent_volumes_only_volume_names(); $environment_variables = $this->generate_environment_variables($ports); + $labels = generateLabelsApplication($this->application, $this->preview); + if (data_get($this->application, 'custom_labels')) { + $labels = str($this->application->custom_labels)->explode(',')->toArray(); + } $docker_compose = [ 'version' => '3.8', 'services' => [ @@ -658,7 +667,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted 'container_name' => $this->container_name, 'restart' => RESTART_MODE, 'environment' => $environment_variables, - 'labels' => generateLabelsApplication($this->application, $this->preview, $ports), + 'labels' => $labels, 'expose' => $ports, 'networks' => [ $this->destination->network, diff --git a/app/Models/Application.php b/app/Models/Application.php index e5bf9db07..2e6c2814d 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -277,4 +277,31 @@ class Application extends BaseModel } return false; } + public function isConfigurationChanged($save = false) + { + $newConfigHash = $this->fqdn . $this->git_repository . $this->git_branch . $this->git_commit_sha . $this->build_pack . $this->static_image . $this->install_command . $this->build_command . $this->start_command . $this->port_exposes . $this->port_mappings . $this->base_directory . $this->publish_directory . $this->health_check_path . $this->health_check_port . $this->health_check_host . $this->health_check_method . $this->health_check_return_code . $this->health_check_scheme . $this->health_check_response_text . $this->health_check_interval . $this->health_check_timeout . $this->health_check_retries . $this->health_check_start_period . $this->health_check_enabled . $this->limits_memory . $this->limits_swap . $this->limits_swappiness . $this->limits_reservation . $this->limits_cpus . $this->limits_cpuset . $this->limits_cpu_shares . $this->dockerfile . $this->dockerfile_location . $this->custom_labels; + if ($this->pull_request_id === 0) { + $newConfigHash .= json_encode($this->environment_variables->all()); + } else { + $newConfigHash .= json_encode($this->environment_variables_preview->all()); + } + $newConfigHash = md5($newConfigHash); + $oldConfigHash = data_get($this, 'config_hash'); + if ($oldConfigHash === null) { + if ($save) { + $this->config_hash = $newConfigHash; + $this->save(); + } + return true; + } + if ($oldConfigHash === $newConfigHash) { + return false; + } else { + if ($save) { + $this->config_hash = $newConfigHash; + $this->save(); + } + return true; + } + } } diff --git a/app/Models/Service.php b/app/Models/Service.php index 4fbb6a1f7..95fe826fb 100644 --- a/app/Models/Service.php +++ b/app/Models/Service.php @@ -538,7 +538,7 @@ class Service extends BaseModel $serviceLabels = $serviceLabels->merge($defaultLabels); if (!$isDatabase && $fqdns->count() > 0) { if ($fqdns) { - $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($fqdns, true)); + $serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik($this->uuid, $fqdns, true)); } } data_set($service, 'labels', $serviceLabels->toArray()); @@ -568,7 +568,7 @@ class Service extends BaseModel 'networks' => $topLevelNetworks->toArray(), ]; $this->docker_compose_raw = Yaml::dump($yaml, 10, 2); - $this->docker_compose = Yaml::dump($finalServices, 10, 2); + $this->docker_compose = Yaml::dump($finalServices, 10, 2); $this->save(); $this->saveComposeConfigs(); return collect([]); diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index adf1761f1..dfa4c1788 100644 --- a/bootstrap/helpers/docker.php +++ b/bootstrap/helpers/docker.php @@ -147,12 +147,11 @@ function defaultLabels($id, $name, $pull_request_id = 0, string $type = 'applica } return $labels; } -function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled, $onlyPort = null) +function fqdnLabelsForTraefik($uuid, Collection $domains, bool $is_force_https_enabled, $onlyPort = null) { $labels = collect([]); $labels->push('traefik.enable=true'); foreach ($domains as $domain) { - $uuid = (string)new Cuid2(7); $url = Url::fromString($domain); $host = $url->getHost(); $path = $url->getPath(); @@ -205,20 +204,21 @@ function fqdnLabelsForTraefik(Collection $domains, bool $is_force_https_enabled, return $labels; } -function generateLabelsApplication(Application $application, ?ApplicationPreview $preview = null, $ports): array +function generateLabelsApplication(Application $application, ?ApplicationPreview $preview = null): array { + $ports = $application->settings->is_static ? [80] : $application->ports_exposes_array; $onlyPort = null; if (count($ports) === 1) { $onlyPort = $ports[0]; } $pull_request_id = data_get($preview, 'pull_request_id', 0); - $container_name = generateApplicationContainerName($application, $pull_request_id); + // $container_name = generateApplicationContainerName($application, $pull_request_id); $appId = $application->id; if ($pull_request_id !== 0 && $pull_request_id !== null) { $appId = $appId . '-pr-' . $pull_request_id; } $labels = collect([]); - $labels = $labels->merge(defaultLabels($appId, $container_name, $pull_request_id)); + $labels = $labels->merge(defaultLabels($appId, $application->uuid, $pull_request_id)); if ($application->fqdn) { if ($pull_request_id !== 0) { $domains = Str::of(data_get($preview, 'fqdn'))->explode(','); @@ -226,7 +226,7 @@ function generateLabelsApplication(Application $application, ?ApplicationPreview $domains = Str::of(data_get($application, 'fqdn'))->explode(','); } // Add Traefik labels no matter which proxy is selected - $labels = $labels->merge(fqdnLabelsForTraefik($domains, $application->settings->is_force_https_enabled,$onlyPort)); + $labels = $labels->merge(fqdnLabelsForTraefik($application->uuid, $domains, $application->settings->is_force_https_enabled, $onlyPort)); } return $labels->all(); } diff --git a/config/sentry.php b/config/sentry.php index 4a096757f..263e642b1 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.92', + 'release' => '4.0.0-beta.93', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index d889b7a6c..1b3ce03c5 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ text('custom_labels')->nullable(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('applications', function (Blueprint $table) { + $table->dropColumn('custom_labels'); + }); + } +}; diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php index 2962cdaa9..79948bd6a 100644 --- a/resources/views/livewire/project/application/general.blade.php +++ b/resources/views/livewire/project/application/general.blade.php @@ -5,8 +5,12 @@ Save + @if ($isConfigurationChanged && !is_null($application->config_hash)) +
Configuration not applied to the running application. You need to + redeploy.
+ @endif -
General configuration for your application.
+
General configuration for your application.
@@ -81,7 +85,6 @@ @if ($application->dockerfile) @endif -

Network

@if ($application->settings->is_static) @@ -93,6 +96,12 @@
+ @if ($labelsChanged) + + @else + + @endif + Reset to Coolify Generated Labels

Advanced

diff --git a/resources/views/project/resources.blade.php b/resources/views/project/resources.blade.php index db8ad2fc8..d268954c6 100644 --- a/resources/views/project/resources.blade.php +++ b/resources/views/project/resources.blade.php @@ -46,9 +46,11 @@
@if (Str::of(data_get($application, 'status'))->startsWith('running')) -
+
@elseif (Str::of(data_get($application, 'status'))->startsWith('exited'))
+ @elseif (Str::of(data_get($application, 'status'))->startsWith('restarting')) +
@endif @endforeach @@ -60,9 +62,11 @@
{{ $database->description }}
@if (Str::of(data_get($database, 'status'))->startsWith('running')) -
+
@elseif (Str::of(data_get($database, 'status'))->startsWith('exited'))
+ @elseif (Str::of(data_get($database, 'status'))->startsWith('restaring')) +
@endif @endforeach @@ -74,9 +78,9 @@
{{ $service->description }}
@if (Str::of(serviceStatus($service))->startsWith('running')) -
+
@elseif (Str::of(serviceStatus($service))->startsWith('degraded')) -
+
@elseif (Str::of(serviceStatus($service))->startsWith('exited'))
@endif diff --git a/versions.json b/versions.json index a78a28277..c4f05a469 100644 --- a/versions.json +++ b/versions.json @@ -4,7 +4,7 @@ "version": "3.12.36" }, "v4": { - "version": "4.0.0-beta.92" + "version": "4.0.0-beta.93" } } }