Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #2022 from coollabsio/next

Browse Source 
v4.0.0-beta.264
This commit is contained in:
Andras Bacsai 2024-04-18 06:58:01 +02:00 committed by GitHub
commit 3843994a05
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
app/Jobs/ApplicationDeploymentJob.php
View File

@ -741,7 +741,7 @@ private function save_environment_variables()
} }
} }
} else { } else {
$this->env_filename = ".env-coolify"; $this->env_filename = ".env";
foreach ($this->application->environment_variables as $env) { foreach ($this->application->environment_variables as $env) {
$real_value = $env->real_value; $real_value = $env->real_value;
if ($env->version === '4.0.0-beta.239') { if ($env->version === '4.0.0-beta.239') {
@ -785,27 +785,27 @@ private function save_environment_variables()
$this->env_filename = null; $this->env_filename = null;
return; return;
} }
$this->execute_remote_command([ // $this->execute_remote_command([
executeInDocker($this->deployment_uuid, "cat $this->workdir/.env 2>/dev/null || true"), // executeInDocker($this->deployment_uuid, "cat $this->workdir/.env 2>/dev/null || true"),
"hidden" => true, // "hidden" => true,
"save" => "dotenv" // "save" => "dotenv"
]); // ]);
if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) { // if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
$base64_dotenv = base64_encode($this->saved_outputs->get('dotenv')->value()); // $base64_dotenv = base64_encode($this->saved_outputs->get('dotenv')->value());
$this->execute_remote_command( // $this->execute_remote_command(
[ // [
"echo '{$base64_dotenv}' | base64 -d | tee $this->configuration_dir/.env > /dev/null" // "echo '{$base64_dotenv}' | base64 -d | tee $this->configuration_dir/.env > /dev/null"
] // ]
); // );
} else { // } else {
$this->execute_remote_command( // $this->execute_remote_command(
[ // [
"command" => "rm -f $this->configuration_dir/.env", // "command" => "rm -f $this->configuration_dir/.env",
"hidden" => true, // "hidden" => true,
"ignore_errors" => true // "ignore_errors" => true
] // ]
); // );
} // }
$envs_base64 = base64_encode($envs->implode("\n")); $envs_base64 = base64_encode($envs->implode("\n"));
$this->execute_remote_command( $this->execute_remote_command(
[ [
@ -1281,21 +1281,23 @@ private function generate_compose_file()
] ]
] ]
]; ];
if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) { // if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
if (data_get($docker_compose, "services.{$this->container_name}.env_file")) { // if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
$docker_compose['services'][$this->container_name]['env_file'][] = '.env'; // $docker_compose['services'][$this->container_name]['env_file'][] = '.env';
} else { // } else {
$docker_compose['services'][$this->container_name]['env_file'] = ['.env']; // $docker_compose['services'][$this->container_name]['env_file'] = ['.env'];
} // }
} // }
// if ($this->env_filename) {
// if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
// $docker_compose['services'][$this->container_name]['env_file'][] = $this->env_filename;
// } else {
// $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
// }
// }
if ($this->env_filename) { if ($this->env_filename) {
if (data_get($docker_compose, "services.{$this->container_name}.env_file")) {
$docker_compose['services'][$this->container_name]['env_file'][] = $this->env_filename;
} else {
$docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename]; $docker_compose['services'][$this->container_name]['env_file'] = [$this->env_filename];
} }
}
if (!$this->custom_healthcheck_found) { if (!$this->custom_healthcheck_found) {
$docker_compose['services'][$this->container_name]['healthcheck'] = [ $docker_compose['services'][$this->container_name]['healthcheck'] = [
'test' => [ 'test' => [

2
config/sentry.php
View File

@ -7,7 +7,7 @@
// The release version of your application // The release version of your application
// Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
'release' => '4.0.0-beta.263', 'release' => '4.0.0-beta.264',
// When left empty or `null` the Laravel environment will be used // When left empty or `null` the Laravel environment will be used
'environment' => config('app.env'), 'environment' => config('app.env'),

2
config/version.php
View File

@ -1,3 +1,3 @@
<?php <?php
return '4.0.0-beta.263'; return '4.0.0-beta.264';

2
versions.json
View File

@ -1,7 +1,7 @@
{ {
"coolify": { "coolify": {
"v4": { "v4": {
"version": "4.0.0-beta.263" "version": "4.0.0-beta.264"
} }
} }
} }