From fc68bf50b5d30f22b43836e0ee402af563d3de37 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 10 Nov 2023 22:04:04 +0100
Subject: [PATCH 1/2] save

---
 app/Models/Service.php           |  1 +
 config/sentry.php                |  2 +-
 config/version.php               |  2 +-
 templates/compose/minio.yaml     | 17 ++++++++---------
 templates/service-templates.json | 12 ------------
 versions.json                    |  2 +-
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/app/Models/Service.php b/app/Models/Service.php
index 6aaa126e7..a1fa4b4ba 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -395,6 +395,7 @@ public function parse(bool $isNew = false): Collection
                         $key = Str::of($variableName);
                         $value = Str::of($variable);
                     }
+                    // TODO: here is the problem
                     if ($key->startsWith('SERVICE_FQDN')) {
                         if ($isNew || $savedService->fqdn === null) {
                             $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
diff --git a/config/sentry.php b/config/sentry.php
index 7f4dd8d43..3a9aa3df6 100644
--- a/config/sentry.php
+++ b/config/sentry.php
@@ -7,7 +7,7 @@
 
     // The release version of your application
     // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
-    'release' => '4.0.0-beta.121',
+    'release' => '4.0.0-beta.122',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 
diff --git a/config/version.php b/config/version.php
index 67d47e548..5a47704b8 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.121';
+return '4.0.0-beta.122';
diff --git a/templates/compose/minio.yaml b/templates/compose/minio.yaml
index 6923af788..fb1e12710 100644
--- a/templates/compose/minio.yaml
+++ b/templates/compose/minio.yaml
@@ -1,3 +1,4 @@
+# ignore: true
 # documentation: https://docs.min.io/docs/minio-docker-quickstart-guide.html
 # slogan: MinIO is a high performance object storage server compatible with Amazon S3 APIs.
 # tags: object, storage, server, s3, api
@@ -7,14 +8,12 @@ services:
     image: quay.io/minio/minio:latest
     command: server /data --console-address ":9001"
     environment:
-      SERVICE_FQDN_MINIO_9000:
-      SERVICE_FQDN_CONSOLE_9001:
-      MINIO_ROOT_USER: $SERVICE_USER_MINIO
-      MINIO_ROOT_PASSWORD: $SERVICE_PASSWORD_MINIO
+      - SERVICE_FQDN_MINIO_9000
+      - SERVICE_FQDN_CONSOLE_9001
+      - MINIO_DOMAIN=$SERVICE_URL_MINIO_9000
+      - MINIO_SERVER_URL=$SERVICE_FQDN_MINIO_9000
+      - MINIO_BROWSER_REDIRECT_URL=$SERVICE_FQDN_CONSOLE_9001
+      - MINIO_ROOT_USER=$SERVICE_USER_MINIO
+      - MINIO_ROOT_PASSWORD=$SERVICE_PASSWORD_MINIO
     volumes:
       - minio-data:/data
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
-      interval: 5s
-      timeout: 20s
-      retries: 10
diff --git a/templates/service-templates.json b/templates/service-templates.json
index 171906e36..13b79ed8e 100644
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@@ -300,18 +300,6 @@
             "playlist"
         ]
     },
-    "minio": {
-        "documentation": "https:\/\/docs.min.io\/docs\/minio-docker-quickstart-guide.html",
-        "slogan": "MinIO is a high performance object storage server compatible with Amazon S3 APIs.",
-        "compose": "c2VydmljZXM6CiAgbWluaW86CiAgICBpbWFnZTogJ3F1YXkuaW8vbWluaW8vbWluaW86bGF0ZXN0JwogICAgY29tbWFuZDogJ3NlcnZlciAvZGF0YSAtLWNvbnNvbGUtYWRkcmVzcyAiOjkwMDEiJwogICAgZW52aXJvbm1lbnQ6CiAgICAgIFNFUlZJQ0VfRlFETl9NSU5JT185MDAwOiBudWxsCiAgICAgIFNFUlZJQ0VfRlFETl9DT05TT0xFXzkwMDE6IG51bGwKICAgICAgTUlOSU9fUk9PVF9VU0VSOiAkU0VSVklDRV9VU0VSX01JTklPCiAgICAgIE1JTklPX1JPT1RfUEFTU1dPUkQ6ICRTRVJWSUNFX1BBU1NXT1JEX01JTklPCiAgICB2b2x1bWVzOgogICAgICAtICdtaW5pby1kYXRhOi9kYXRhJwogICAgaGVhbHRoY2hlY2s6CiAgICAgIHRlc3Q6CiAgICAgICAgLSBDTUQKICAgICAgICAtIGN1cmwKICAgICAgICAtICctZicKICAgICAgICAtICdodHRwOi8vbG9jYWxob3N0OjkwMDAvbWluaW8vaGVhbHRoL2xpdmUnCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAK",
-        "tags": [
-            "object",
-            "storage",
-            "server",
-            "s3",
-            "api"
-        ]
-    },
     "moodle": {
         "documentation": "https:\/\/moodle.org",
         "slogan": "Moodle is the world\u2019s most customisable and trusted eLearning solution that empowers educators to improve our world.",
diff --git a/versions.json b/versions.json
index 186ce0d84..21fa4227d 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.121"
+            "version": "4.0.0-beta.122"
         }
     }
 }

From a94b7ee611f2d07b21f313f63773cb696920777b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 11 Nov 2023 10:18:40 +0100
Subject: [PATCH 2/2] fix: container status jobs for old pr deployments

---
 app/Jobs/ContainerStatusJob.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php
index 0d4028f8f..3b995d721 100644
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@@ -159,6 +159,9 @@ public function handle(): void
                 if ($applicationId) {
                     $pullRequestId = data_get($labels, 'coolify.pullRequestId');
                     if ($pullRequestId) {
+                        if (str($applicationId)->contains('-')) {
+                            $applicationId = str($applicationId)->before('-');
+                        }
                         $preview = ApplicationPreview::where('application_id', $applicationId)->where('pull_request_id', $pullRequestId)->first();
                         if ($preview) {
                             $foundApplicationPreviews[] = $preview->id;