From 7c0b98bb70eddc3739d114a37f74c20d38506b8f Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Thu, 18 Apr 2024 12:37:06 +0200 Subject: [PATCH] Fix sorting issue in save_environment_variables() function --- app/Jobs/ApplicationDeploymentJob.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php index 594b1e412..4b4631de9 100644 --- a/app/Jobs/ApplicationDeploymentJob.php +++ b/app/Jobs/ApplicationDeploymentJob.php @@ -740,6 +740,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted $envs->push("SOURCE_COMMIT=unknown"); } } + $envs = $envs->sort(function ($a, $b) { + return strpos($a, '$') === false ? -1 : 1; + }); } else { $this->env_filename = ".env"; foreach ($this->application->environment_variables as $env) { @@ -783,7 +786,16 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted "ignore_errors" => true ] ); - return; + } else { + $envs_base64 = base64_encode($envs->implode("\n")); + $this->execute_remote_command( + [ + executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d | tee $this->workdir/{$this->env_filename} > /dev/null") + ], + [ + "echo '$envs_base64' | base64 -d | tee $this->configuration_dir/{$this->env_filename} > /dev/null" + ] + ); } // $this->execute_remote_command([ // executeInDocker($this->deployment_uuid, "cat $this->workdir/.env 2>/dev/null || true"), @@ -806,15 +818,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted // ] // ); // } - $envs_base64 = base64_encode($envs->implode("\n")); - $this->execute_remote_command( - [ - executeInDocker($this->deployment_uuid, "echo '$envs_base64' | base64 -d | tee $this->workdir/{$this->env_filename} > /dev/null") - ], - [ - "echo '$envs_base64' | base64 -d | tee $this->configuration_dir/{$this->env_filename} > /dev/null" - ] - ); + }