diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 6f0fa2e4b..6cf642f27 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -329,7 +329,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue } else { $this->write_deployment_configurations(); } - $this->application_deployment_queue->addLogEntry("Starting graceful shutdown container: {$this->deployment_uuid}"); + $this->application_deployment_queue->addLogEntry("Gracefully shutting down build container: {$this->deployment_uuid}"); $this->graceful_shutdown_container($this->deployment_uuid); ApplicationStatusChanged::dispatch(data_get($this->application, 'environment.project.team.id')); @@ -1709,11 +1709,10 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue ]); $this->application->parseHealthcheckFromDockerfile($this->saved_outputs->get('dockerfile_from_repo')); } - $network_aliases = []; - if (is_array($this->application->network_aliases) && count($this->application->network_aliases) > 0) { - $network_aliases = $this->application->network_aliases; + $custom_network_aliases = []; + if (is_array($this->application->custom_network_aliases) && count($this->application->custom_network_aliases) > 0) { + $custom_network_aliases = $this->application->custom_network_aliases; } - ray($network_aliases); $docker_compose = [ 'services' => [ $this->container_name => [ @@ -1725,7 +1724,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue $this->destination->network => [ 'aliases' => array_merge( [$this->container_name], - $network_aliases + $custom_network_aliases ), ], ], diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php index bfe0f8387..eaa988b99 100644 --- a/app/Livewire/Project/Application/General.php +++ b/app/Livewire/Project/Application/General.php @@ -68,7 +68,7 @@ class General extends Component 'application.publish_directory' => 'nullable', 'application.ports_exposes' => 'required', 'application.ports_mappings' => 'nullable', - 'application.network_aliases' => 'nullable', + 'application.custom_network_aliases' => 'nullable', 'application.dockerfile' => 'nullable', 'application.docker_registry_image_name' => 'nullable', 'application.docker_registry_image_tag' => 'nullable', diff --git a/app/Models/Application.php b/app/Models/Application.php index fe7181451..2feaebf94 100644 --- a/app/Models/Application.php +++ b/app/Models/Application.php @@ -45,7 +45,7 @@ use Visus\Cuid2\Cuid2; 'start_command' => ['type' => 'string', 'description' => 'Start command.'], 'ports_exposes' => ['type' => 'string', 'description' => 'Ports exposes.'], 'ports_mappings' => ['type' => 'string', 'nullable' => true, 'description' => 'Ports mappings.'], - 'network_aliases' => ['type' => 'string', 'nullable' => true, 'description' => 'Network aliases for Docker container.'], + 'custom_network_aliases' => ['type' => 'string', 'nullable' => true, 'description' => 'Network aliases for Docker container.'], 'base_directory' => ['type' => 'string', 'description' => 'Base directory for all commands.'], 'publish_directory' => ['type' => 'string', 'description' => 'Publish directory.'], 'health_check_enabled' => ['type' => 'boolean', 'description' => 'Health check enabled.'], @@ -116,9 +116,9 @@ class Application extends BaseModel protected $appends = ['server_status']; - protected $casts = ['network_aliases' => 'array']; + protected $casts = ['custom_network_aliases' => 'array']; - public function networkAliases(): Attribute + public function customNetworkAliases(): Attribute { return Attribute::make( set: function ($value) { diff --git a/database/migrations/2025_01_05_050736_add_network_aliases_to_applications_table.php b/database/migrations/2025_01_05_050736_add_network_aliases_to_applications_table.php index a4e8018a0..61fadd0e5 100644 --- a/database/migrations/2025_01_05_050736_add_network_aliases_to_applications_table.php +++ b/database/migrations/2025_01_05_050736_add_network_aliases_to_applications_table.php @@ -9,14 +9,14 @@ return new class extends Migration public function up() { Schema::table('applications', function (Blueprint $table) { - $table->text('network_aliases')->nullable(); + $table->text('custom_network_aliases')->nullable(); }); } public function down() { Schema::table('applications', function (Blueprint $table) { - $table->dropColumn('network_aliases'); + $table->dropColumn('custom_network_aliases'); }); } }; diff --git a/resources/views/livewire/project/application/general.blade.php b/resources/views/livewire/project/application/general.blade.php index d51dd0257..f971c8a4f 100644 --- a/resources/views/livewire/project/application/general.blade.php +++ b/resources/views/livewire/project/application/general.blade.php @@ -343,9 +343,9 @@ helper="A comma separated list of ports you would like to map to the host system. Useful when you do not want to use domains.

Example:
3000:3000,3002:3002

Rolling update is not supported if you have a port mapped to the host." /> @endif @if (!$application->destination->server->isSwarm()) - + wire:model="application.custom_network_aliases" /> @endif