From 81e9c6d8a3c02229bef75f586acadfc357a1400f Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:26:28 +0100
Subject: [PATCH 01/37] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 0a3ce0132..e834ecb34 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
| Andras Bacsai | Peak |
|------------|------------|
| 
| 
|
-| 
| |
+| 
| |
# Repo Activity
From 8a5a67813c3cc48d21bbbcf999199b3d8d72d168 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:29:02 +0100
Subject: [PATCH 02/37] Update README.md
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index e834ecb34..a3ea4a272 100644
--- a/README.md
+++ b/README.md
@@ -147,10 +147,10 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
# Core Maintainers
-| Andras Bacsai | Peak |
+| Andras Bacsai | 🏔️ Peak |
|------------|------------|
| | |
-| | |
+| | |
# Repo Activity
From cfbe21feccbfb815feefb8034f1d4de38b842790 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:29:30 +0100
Subject: [PATCH 03/37] Revert "Update README.md"
This reverts commit 8a5a67813c3cc48d21bbbcf999199b3d8d72d168.
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index a3ea4a272..e834ecb34 100644
--- a/README.md
+++ b/README.md
@@ -147,10 +147,10 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
# Core Maintainers
-| Andras Bacsai | 🏔️ Peak |
+| Andras Bacsai | Peak |
|------------|------------|
| | |
-| | |
+| | |
# Repo Activity
From 6497514f4ebab60959627cbac04d7378700d8119 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:29:52 +0100
Subject: [PATCH 04/37] Reapply "Update README.md"
This reverts commit cfbe21feccbfb815feefb8034f1d4de38b842790.
---
README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
index e834ecb34..a3ea4a272 100644
--- a/README.md
+++ b/README.md
@@ -147,10 +147,10 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
# Core Maintainers
-| Andras Bacsai | Peak |
+| Andras Bacsai | 🏔️ Peak |
|------------|------------|
| | |
-| | |
+| | |
# Repo Activity
From e97a122d6360beff054e7875c75f4f447487378e Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Fri, 22 Nov 2024 17:34:42 +0100
Subject: [PATCH 05/37] Update README.md
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index a3ea4a272..8f0df0bda 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,7 @@ By subscribing to the cloud version, you get the Coolify server for the same pri
| Andras Bacsai | 🏔️ Peak |
|------------|------------|
-| | |
+| | |
| | |
# Repo Activity
From 11fb5a9e32a86da4f77a654bd2e91cd8dcc47dc6 Mon Sep 17 00:00:00 2001
From: Andras Bacsai
Date: Mon, 25 Nov 2024 14:34:18 +0100
Subject: [PATCH 06/37] fix: service generate includes yml files as well (haha)
---
app/Console/Commands/ServicesGenerate.php | 5 ++++-
templates/service-templates.json | 15 +++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/app/Console/Commands/ServicesGenerate.php b/app/Console/Commands/ServicesGenerate.php
index 1559e5f6d..06287c1b8 100644
--- a/app/Console/Commands/ServicesGenerate.php
+++ b/app/Console/Commands/ServicesGenerate.php
@@ -20,7 +20,10 @@ class ServicesGenerate extends Command
public function handle(): int
{
- $serviceTemplatesJson = collect(glob(base_path('templates/compose/*.yaml')))
+ $serviceTemplatesJson = collect(array_merge(
+ glob(base_path('templates/compose/*.yaml')),
+ glob(base_path('templates/compose/*.yml'))
+ ))
->mapWithKeys(function ($file): array {
$file = basename($file);
$parsed = $this->processFile($file);
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 4f1568613..faa4a6297 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -3040,5 +3040,20 @@
"logo": "svgs/zipline.png",
"minversion": "0.0.0",
"port": "3000"
+ },
+ "convertx": {
+ "documentation": "https://github.com/C4illin/ConvertX?utm_source=coolify.io",
+ "slogan": "A self-hosted online file converter. Supports over a thousand different formats.",
+ "compose": "c2VydmljZXM6CiAgY29udmVydHg6CiAgICBpbWFnZTogJ2doY3IuaW8vYzRpbGxpbi9jb252ZXJ0eDpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQ09OVkVSVFgKICAgICAgLSAnQUNDT1VOVF9SRUdJU1RSQVRJT049JHtBQ0NPVU5UX1JFR0lTVFJBVElPTjotZmFsc2V9JwogICAgICAtICdIVFRQX0FMTE9XRUQ9JHtIVFRQX0FMTE9XRUQ6LXRydWV9JwogICAgICAtICdBTExPV19VTkFVVEhFTlRJQ0FURUQ9JHtBTExPV19VTkFVVEhFTlRJQ0FURUQ6LWZhbHNlfScKICAgICAgLSAnQVVUT19ERUxFVEVfRVZFUllfTl9IT1VSUz0ke0FVVE9fREVMRVRFX0VWRVJZX05fSE9VUlM6LTI0fScKICAgICAgLSAnSldUX1NFQ1JFVD0ke1NFUlZJQ0VfUEFTU1dPUkRfQ09OVkVSVFhKV1RTRUNSRVR9JwogICAgdm9sdW1lczoKICAgICAgLSAnY29udmVydHhfZGF0YTovYXBwL2RhdGEnCg==",
+ "tags": [
+ "converter",
+ "file",
+ "documents",
+ "files",
+ "directories"
+ ],
+ "logo": "svgs/convertx.png",
+ "minversion": "0.0.0",
+ "port": "3000"
}
}
From f0a44f4022d7ed9609e9cebc85211e0103ff66a9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai
Date: Mon, 25 Nov 2024 14:37:44 +0100
Subject: [PATCH 07/37] fix: servercheckJob should run every 5 minutes on cloud
---
app/Console/Kernel.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 832dcf58b..fe5e2c407 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -141,8 +141,12 @@ class Kernel extends ConsoleKernel
if (validate_timezone($serverTimezone) === false) {
$serverTimezone = config('app.timezone');
}
- $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
- // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyMinute()->onOneServer();
+ if (isCloud()) {
+ $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyFiveMinutes()->onOneServer();
+ } else {
+ $this->scheduleInstance->job(new ServerCheckJob($server))->timezone($serverTimezone)->everyMinute()->onOneServer();
+ }
+ // $this->scheduleInstance->job(new \App\Jobs\ServerCheckNewJob($server))->everyFiveMinutes()->onOneServer();
// Check storage usage every 10 minutes if Sentinel does not activated
$this->scheduleInstance->job(new ServerStorageCheckJob($server))->everyTenMinutes()->onOneServer();
From d87cb67229f08c584a23aba8045e1631148b26fb Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:10:21 +0100
Subject: [PATCH 08/37] fix body section
---
resources/views/layouts/base.blade.php | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php
index 5213479c8..b581fb3c5 100644
--- a/resources/views/layouts/base.blade.php
+++ b/resources/views/layouts/base.blade.php
@@ -43,9 +43,8 @@
@endauth
-@section('body')
-
-
+
+ @section('body')
-
-@show
+ @show
+