An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.
PHP coolifydatabasesdeploymentdockerdocker-composeinertiajslaravelmariadbmysqlnextjsnodejsphppostgresredisself-hostedself-hostingserverstatic-sitesveltesvelte5
fix(docker): only use custom container names in consistent naming mode
peaklabs-devde013ace2ab3
diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.phpindex 19c0b750ec..5a7ebd762d 100644--- a/app/Jobs/ApplicationDeploymentJob.php+++ b/app/Jobs/ApplicationDeploymentJob.php@@ -1992,7 +1992,6 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueuetry {if (! ValidationPatterns::isValidEnvironmentVariableKey($key)) {throw new \InvalidArgumentException('Invalid build-time environment variable key.');-}return $key;@@ -2183,7 +2182,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue$this->write_deployment_configurations();$this->server = $this->mainServer;}- if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty() || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {+ if (count($this->application->ports_mappings_array) > 0 || (bool) $this->application->settings->is_consistent_container_name_enabled || $this->pull_request_id !== 0 || str($this->application->custom_docker_run_options)->contains('--ip') || str($this->application->custom_docker_run_options)->contains('--ip6')) {$this->application_deployment_queue->addLogEntry('----------------------------------------');if (count($this->application->ports_mappings_array) > 0) {$this->application_deployment_queue->addLogEntry('Application has ports mapped to the host system, rolling update is not supported.');@@ -2191,7 +2190,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueueif ((bool) $this->application->settings->is_consistent_container_name_enabled) {$this->application_deployment_queue->addLogEntry('Consistent container name feature enabled, rolling update is not supported.');}- if (str($this->application->settings->custom_internal_name)->isNotEmpty()) {+ if ((bool) $this->application->settings->is_consistent_container_name_enabled && str($this->application->settings->custom_internal_name)->isNotEmpty()) {$this->application_deployment_queue->addLogEntry('Custom internal name is set, rolling update is not supported.');}if ($this->pull_request_id !== 0) {@@ -2219,7 +2218,7 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueueprivate function resolveContainerName(): string{- if (str($this->application->settings->custom_internal_name)->isEmpty()) {+ if (! $this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isEmpty()) {return generateApplicationContainerName($this->application, $this->pull_request_id);}@@ -4285,7 +4284,7 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");try {$this->application_deployment_queue->addLogEntry('Removing old containers.');if ($this->newVersionIsHealthy || $force) {- if ($this->application->settings->is_consistent_container_name_enabled || str($this->application->settings->custom_internal_name)->isNotEmpty()) {+ if ($this->application->settings->is_consistent_container_name_enabled) {$containers = getCurrentApplicationContainerStatus($this->server, $this->application->id, $this->pull_request_id);$this->containerNamesToRemove($containers)->each(function (string $containerName) {$this->graceful_shutdown_container($containerName);diff --git a/tests/Unit/ApplicationDeploymentContainerNamingTest.php b/tests/Unit/ApplicationDeploymentContainerNamingTest.phpindex b7b63ae544..68197ffa6f 100644--- a/tests/Unit/ApplicationDeploymentContainerNamingTest.php+++ b/tests/Unit/ApplicationDeploymentContainerNamingTest.php@@ -56,3 +56,12 @@ it('includes old generated containers when cleaning up a consistent deployment',expect($reflection->getMethod('containerNamesToRemove')->invoke($job, $containers)->all())->toBe(['application-uuid-192238854305', 'shadowuw']);});++it('ignores the custom container name when consistent naming is disabled', function () {+ $application = applicationWithContainerNaming();+ $application->settings->is_consistent_container_name_enabled = false;++ [$job, $reflection] = containerNamingJob($application);++ expect($reflection->getMethod('resolveContainerName')->invoke($job))->toStartWith('application-uuid-');+});