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
Dont ignore "force https" pref when using docker compose
Jono35a61102522b
diff --git a/app/Models/ServiceApplication.php b/app/Models/ServiceApplication.phpindex 7b8b46812d..cbd02daa63 100644--- a/app/Models/ServiceApplication.php+++ b/app/Models/ServiceApplication.php@@ -81,6 +81,11 @@ class ServiceApplication extends BaseModelreturn data_get($this, 'is_gzip_enabled', true);}+ public function isForceHttpsEnabled()+ {+ return data_get($this, 'is_force_https_enabled', true);+ }+public function type(){return 'service';diff --git a/app/Models/ServiceDatabase.php b/app/Models/ServiceDatabase.phpindex f6a39cfe48..aee71295ac 100644--- a/app/Models/ServiceDatabase.php+++ b/app/Models/ServiceDatabase.php@@ -80,6 +80,11 @@ class ServiceDatabase extends BaseModelreturn data_get($this, 'is_gzip_enabled', true);}+ public function isForceHttpsEnabled()+ {+ return data_get($this, 'is_force_https_enabled', true);+ }+public function type(){return 'service';diff --git a/bootstrap/helpers/parsers.php b/bootstrap/helpers/parsers.phpindex 43ba58e597..45125bce74 100644--- a/bootstrap/helpers/parsers.php+++ b/bootstrap/helpers/parsers.php@@ -1233,7 +1233,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),@@ -1246,7 +1246,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?intnetwork: $network,uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),@@ -1260,7 +1260,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?int$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),@@ -1271,7 +1271,7 @@ function applicationParser(Application $resource, int $pull_request_id = 0, ?intnetwork: $network,uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),@@ -2329,7 +2329,7 @@ function serviceParser(Service $resource): Collection$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),@@ -2342,7 +2342,7 @@ function serviceParser(Service $resource): Collectionnetwork: $network,uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),@@ -2356,7 +2356,7 @@ function serviceParser(Service $resource): Collection$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),@@ -2367,7 +2367,7 @@ function serviceParser(Service $resource): Collectionnetwork: $network,uuid: $uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $originalResource->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $originalResource->isGzipEnabled(),is_stripprefix_enabled: $originalResource->isStripprefixEnabled(),diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.phpindex 4372ff955c..2a7d5cbb0f 100644--- a/bootstrap/helpers/shared.php+++ b/bootstrap/helpers/shared.php@@ -1933,7 +1933,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(uuid: $resource->uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $savedService->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $savedService->isGzipEnabled(),is_stripprefix_enabled: $savedService->isStripprefixEnabled(),@@ -1946,7 +1946,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = falnetwork: $resource->destination->network,uuid: $resource->uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $savedService->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $savedService->isGzipEnabled(),is_stripprefix_enabled: $savedService->isStripprefixEnabled(),@@ -1959,7 +1959,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal$serviceLabels = $serviceLabels->merge(fqdnLabelsForTraefik(uuid: $resource->uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $savedService->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $savedService->isGzipEnabled(),is_stripprefix_enabled: $savedService->isStripprefixEnabled(),@@ -1970,7 +1970,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = falnetwork: $resource->destination->network,uuid: $resource->uuid,domains: $fqdns,- is_force_https_enabled: true,+ is_force_https_enabled: $savedService->isForceHttpsEnabled(),serviceLabels: $serviceLabels,is_gzip_enabled: $savedService->isGzipEnabled(),is_stripprefix_enabled: $savedService->isStripprefixEnabled(),