Merge pull request #1430 from coollabsio/next

v4.0.0-beta.122

app/Jobs/ApplicationDeploymentJob.php

@@ -556,7 +556,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
                 "hidden" => true,
             ],
             [
-                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->workdir}")
+                "command" => executeInDocker($this->deployment_uuid, "mkdir -p {$this->basedir}")
             ],
         );
     }

app/Jobs/ContainerStatusJob.php

@@ -159,6 +159,9 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
                 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;

app/Models/Service.php

@@ -395,6 +395,7 @@ class Service extends BaseModel
                         $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();

config/sentry.php

@@ -7,7 +7,7 @@ return [
 
     // 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.120',
+    'release' => '4.0.0-beta.122',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/subscription.php

@@ -11,6 +11,7 @@ return [
     'stripe_price_id_pro_yearly' => env('STRIPE_PRICE_ID_PRO_YEARLY', null),
     'stripe_price_id_ultimate_monthly' => env('STRIPE_PRICE_ID_ULTIMATE_MONTHLY', null),
     'stripe_price_id_ultimate_yearly' => env('STRIPE_PRICE_ID_ULTIMATE_YEARLY', null),
+    'stripe_excluded_plans' => env('STRIPE_EXCLUDED_PLANS', null),
 
 
     // Paddle

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.120';
+return '4.0.0-beta.122';

resources/views/livewire/project/application/deployment-logs.blade.php

@@ -14,7 +14,7 @@
     @endif
     <div id="screen" :class="fullscreen ? 'fullscreen' : ''">
         <div @if ($isKeepAliveOn) wire:poll.2000ms="polling" @endif
-            class="relative flex flex-col-reverse w-full p-2 px-4 mt-4 overflow-y-auto scrollbar border-coolgray-400"
+            class="relative flex flex-col-reverse w-full p-2 px-4 mt-4 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
             :class="fullscreen ? '' : 'max-h-[40rem] border border-dotted rounded'">
             <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4" x-on:click="makeFullscreen"><svg
                     class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@@ -48,7 +48,7 @@
                     @foreach (decode_remote_command_output($application_deployment_queue) as $line)
                         <div @class([
                             'font-mono whitespace-pre-line',
-                            'text-neutral-400' => $line['type'] == 'stdout',
+                            'text-white' => $line['type'] == 'stdout',
                             'text-error' => $line['type'] == 'stderr',
                             'text-warning' => $line['hidden'],
                         ])>[{{ $line['timestamp'] }}] @if ($line['hidden'])

resources/views/livewire/project/application/deployments.blade.php

@@ -12,14 +12,14 @@
     </form>
     @forelse ($deployments as $deployment)
         <a @class([
-            'bg-coolgray-200 p-2 border-l border-dashed transition-colors hover:no-underline',
+            'bg-coolgray-100 p-2 border-l border-dashed transition-colors hover:no-underline',
             'hover:bg-coolgray-200' =>
-                data_get($deployment, 'status') === 'queued' ||
-                data_get($deployment, 'status') === 'cancelled by system',
+                data_get($deployment, 'status') === 'queued',
             'border-warning hover:bg-warning hover:text-black' =>
-                data_get($deployment, 'status') === 'in_progress',
+                data_get($deployment, 'status') === 'in_progress'  ||
+                data_get($deployment, 'status') === 'cancelled-by-user',
             'border-error hover:bg-error' =>
-                data_get($deployment, 'status') === 'error',
+                data_get($deployment, 'status') === 'failed',
             'border-success hover:bg-success' =>
                 data_get($deployment, 'status') === 'finished',
         ]) href="{{ $current_url . '/' . data_get($deployment, 'deployment_uuid') }}"

resources/views/livewire/project/application/general.blade.php

@@ -52,7 +52,7 @@
                 @if ($application->could_set_build_commands())
                     @if ($application->build_pack === 'nixpacks')
                         <div>Nixpacks will detect the required configuration automatically.
-                            <a class="underline" href="https://coolify.io/docs/frameworks">Framework Specific Docs</a>
+                            <a class="underline" href="https://coolify.io/docs/frameworks/">Framework Specific Docs</a>
                         </div>
                         <div class="flex flex-col gap-2 xl:flex-row">
                             <x-forms.input placeholder="If you modify this, you probably need to have a nixpacks.toml"

resources/views/livewire/project/shared/get-logs.blade.php

@@ -14,7 +14,7 @@
         <x-forms.button type="submit">Refresh</x-forms.button>
     </form>
     <div id="screen" x-data="{ fullscreen: false, alwaysScroll: false, intervalId: null }" :class="fullscreen ? 'fullscreen' : 'container w-full pt-4 mx-auto'">
-        <div class="relative flex flex-col-reverse w-full p-4 pt-6 overflow-y-auto text-white scrollbar border-coolgray-300"
+        <div class="relative flex flex-col-reverse w-full p-4 pt-6 overflow-y-auto text-white bg-coolgray-100 scrollbar border-coolgray-300"
             :class="fullscreen ? '' : 'max-h-[40rem] border border-solid rounded'">
             <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4" x-on:click="makeFullscreen"><svg
                     class="icon" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

resources/views/project/application/configuration.blade.php

@@ -5,10 +5,12 @@
         <div class="flex flex-col gap-4 min-w-fit">
             <a :class="activeTab === 'general' && 'text-white'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
-            <a :class="activeTab === 'environment-variables' && 'text-white'"
-                @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
-                href="#">Environment
-                Variables</a>
+            @if ($application->build_pack !== 'static')
+                <a :class="activeTab === 'environment-variables' && 'text-white'"
+                    @click.prevent="activeTab = 'environment-variables'; window.location.hash = 'environment-variables'"
+                    href="#">Environment
+                    Variables</a>
+            @endif
             @if ($application->git_based())
                 <a :class="activeTab === 'source' && 'text-white'"
                     @click.prevent="activeTab = 'source'; window.location.hash = 'source'" href="#">Source</a>
@@ -16,21 +18,25 @@
             <a :class="activeTab === 'server' && 'text-white'"
                 @click.prevent="activeTab = 'server'; window.location.hash = 'server'" href="#">Server
             </a>
-            <a :class="activeTab === 'storages' && 'text-white'"
-                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
-            </a>
+            @if ($application->build_pack !== 'static')
+                <a :class="activeTab === 'storages' && 'text-white'"
+                    @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
+                </a>
+            @endif
             <a :class="activeTab === 'webhooks' && 'text-white'"
                 @click.prevent="activeTab = 'webhooks'; window.location.hash = 'webhooks'" href="#">Webhooks
             </a>
-            @if ($application->git_based())
+            @if ($application->git_based() && $application->build_pack !== 'static')
                 <a :class="activeTab === 'previews' && 'text-white'"
                     @click.prevent="activeTab = 'previews'; window.location.hash = 'previews'" href="#">Preview
                     Deployments
                 </a>
             @endif
-            <a :class="activeTab === 'health' && 'text-white'"
-                @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Health Checks
-            </a>
+            @if ($application->build_pack !== 'static')
+                <a :class="activeTab === 'health' && 'text-white'"
+                    @click.prevent="activeTab = 'health'; window.location.hash = 'health'" href="#">Health Checks
+                </a>
+            @endif
             <a :class="activeTab === 'rollback' && 'text-white'"
                 @click.prevent="activeTab = 'rollback'; window.location.hash = 'rollback'" href="#">Rollback
             </a>

routes/webhooks.php

@@ -237,7 +237,7 @@ Route::post('/payments/stripe/events', function () {
     try {
         $webhookSecret = config('subscription.stripe_webhook_secret');
         $signature = request()->header('Stripe-Signature');
-
+        $excludedPlans = config('subscription.stripe_excluded_plans');
         $event = \Stripe\Webhook::constructEvent(
             request()->getContent(),
             $signature,
@@ -253,6 +253,10 @@ Route::post('/payments/stripe/events', function () {
         switch ($type) {
             case 'checkout.session.completed':
                 $clientReferenceId = data_get($data, 'client_reference_id');
+                if (is_null($clientReferenceId)) {
+                    send_internal_notification('Checkout session completed without client reference id.');
+                    break;
+                }
                 $userId = Str::before($clientReferenceId, ':');
                 $teamId = Str::after($clientReferenceId, ':');
                 $subscriptionId = data_get($data, 'subscription');
@@ -282,12 +286,17 @@ Route::post('/payments/stripe/events', function () {
                 break;
             case 'invoice.paid':
                 $customerId = data_get($data, 'customer');
+                $planId = data_get($data, 'lines.data.0.plan.id');
+                if (Str::contains($excludedPlans, $planId)) {
+                    send_internal_notification('Subscription excluded.');
+                    break;
+                }
                 $subscription = Subscription::where('stripe_customer_id', $customerId)->first();
                 if (!$subscription) {
                     Sleep::for(5)->seconds();
                     $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
                 }
-                $planId = data_get($data, 'lines.data.0.plan.id');
+
                 $subscription->update([
                     'stripe_plan_id' => $planId,
                     'stripe_invoice_paid' => true,
@@ -303,11 +312,15 @@ Route::post('/payments/stripe/events', function () {
                 break;
             case 'customer.subscription.updated':
                 $customerId = data_get($data, 'customer');
-                $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
-                $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
                 $status = data_get($data, 'status');
                 $subscriptionId = data_get($data, 'items.data.0.subscription');
                 $planId = data_get($data, 'items.data.0.plan.id');
+                if (Str::contains($excludedPlans, $planId)) {
+                    send_internal_notification('Subscription excluded.');
+                    break;
+                }
+                $subscription = Subscription::where('stripe_customer_id', $customerId)->firstOrFail();
+                $trialEndedAlready = data_get($subscription, 'stripe_trial_already_ended');
                 $cancelAtPeriodEnd = data_get($data, 'cancel_at_period_end');
                 $alreadyCancelAtPeriodEnd = data_get($subscription, 'stripe_cancel_at_period_end');
                 $feedback = data_get($data, 'cancellation_details.feedback');

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

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.",

versions.json

@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.120"
+            "version": "4.0.0-beta.122"
         }
     }
 }