From 5abd4a6d789494da6f64ffc79b08a9b80fe99b76 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Mon, 13 Nov 2023 15:49:23 +0100 Subject: [PATCH] Update version and fix MINIO_BROWSER_REDIRECT_URL and MINIO_SERVER_URL --- bootstrap/helpers/docker.php | 10 +++++++--- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/bootstrap/helpers/docker.php b/bootstrap/helpers/docker.php index 7a92ab072..e9432eaa4 100644 --- a/bootstrap/helpers/docker.php +++ b/bootstrap/helpers/docker.php @@ -152,14 +152,18 @@ function generateServiceSpecificFqdns($service, $forTraefik = false) switch ($type) { case $type->contains('minio'): $MINIO_BROWSER_REDIRECT_URL = $variables->where('key', 'MINIO_BROWSER_REDIRECT_URL')->first(); + $MINIO_SERVER_URL = $variables->where('key', 'MINIO_SERVER_URL')->first(); + return $payload; + if (is_null($MINIO_BROWSER_REDIRECT_URL) || is_null($MINIO_SERVER_URL)) { + return $payload; + } if (is_null($MINIO_BROWSER_REDIRECT_URL?->value)) { - $MINIO_BROWSER_REDIRECT_URL->update([ + $MINIO_BROWSER_REDIRECT_URL?->update([ "value" => generateFqdn($service->service->server, 'console-' . $service->uuid) ]); } - $MINIO_SERVER_URL = $variables->where('key', 'MINIO_SERVER_URL')->first(); if (is_null($MINIO_SERVER_URL?->value)) { - $MINIO_SERVER_URL->update([ + $MINIO_SERVER_URL?->update([ "value" => generateFqdn($service->service->server, 'minio-' . $service->uuid) ]); } diff --git a/config/sentry.php b/config/sentry.php index b2f0653c0..f4782efc9 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.127', + 'release' => '4.0.0-beta.128', // 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 7ca7b6014..7baa6453b 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@