Skip to content

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.

Merge remote-tracking branch 'origin/next' into automation/sync-main-to-next

Andras Bacsai6a8cee463090
diff --cc app/Models/Service.php
index e963571cb4,2f1a0264c2..6ed5e836f2
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@@ -1615,13 -1618,13 +1618,13 @@@ class Service extends BaseMode
return 3;
});
foreach ($sorted as $env) {
- $envs->push("{$env->key}={$env->real_value}");
+ $envs->push("{$env->key}={$this->resolveSecretManagerEnvironmentVariable($env)}");
}
if ($envs->count() === 0) {
- $commands[] = 'touch .env';
+ $commands[] = "touch {$environmentFilename} && mv {$environmentFilename} .env";
} else {
$envs_base64 = base64_encode($envs->implode("\n"));
- $commands[] = "echo '$envs_base64' | base64 -d | tee .env > /dev/null";
+ $commands[] = "echo '$envs_base64' | base64 -d | tee {$environmentFilename} > /dev/null && mv {$environmentFilename} .env";
}
instant_remote_process($commands, $this->server);
diff --cc openapi.json
index 718191d3cf,1e10d2ff88..6695b46132
--- a/openapi.json
+++ b/openapi.json
@@@ -16817,13 -17290,11 +17290,19 @@@
"null"
]
},
+ "max_restart_count": {
+ "description": "Maximum Docker restart count before Coolify stops the container. Set to 0 to disable the limit.",
+ "type": [
+ "integer",
+ "null"
+ ],
+ "minimum": 0
++ },
+ "is_force_https_enabled": {
+ "type": [
+ "boolean",
+ "null"
+ ]
}
},
"type": "object"
diff --cc openapi.yaml
index a53ab1439a,8ca49738cc..53d98109ec
--- a/openapi.yaml
+++ b/openapi.yaml
@@@ -10658,10 -10944,8 +10944,12 @@@ paths
type: [boolean, 'null']
is_stripprefix_enabled:
type: [boolean, 'null']
+ max_restart_count:
+ description: 'Maximum Docker restart count before Coolify stops the container. Set to 0 to disable the limit.'
+ type: [integer, 'null']
+ minimum: 0
+ is_force_https_enabled:
+ type: [boolean, 'null']
type: object
responses:
'200':
diff --cc tests/Feature/ApplicationDomainsTest.php
index d7be33df7d,f7ee811367..74c9db670f
--- a/tests/Feature/ApplicationDomainsTest.php
+++ b/tests/Feature/ApplicationDomainsTest.php
@@@ -15,8 -19,8 +19,9 @@@ use App\Models\Team
use App\Models\User;
use App\Support\ValidationPatterns;
use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\DB;
+ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Queue;
use Illuminate\Support\Str;
use Livewire\Livewire;