Merge pull request #2012 from coollabsio/next

v4.0.0-beta.261
2024-04-17 15:34:44 +02:00 · 2024-04-17 15:34:44 +02:00 · aa79acd09e
commit aa79acd09e
parent df5bde7b8e 67011ccd72
13 changed files with 84 additions and 48 deletions
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@ -56,7 +56,7 @@ public function register(): void
    {
        $this->reportable(function (Throwable $e) {
            if (isDev()) {
-                // return;
+                return;
            }
            if ($e instanceof RuntimeException) {
                return;
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@ -49,6 +49,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
    private string $deployment_uuid;
    private int $pull_request_id;
    private string $commit;
+    private bool $rollback;
    private bool $force_rebuild;
    private bool $restart_only;

@ -117,6 +118,7 @@ public function __construct(int $application_deployment_queue_id)
        $this->deployment_uuid = $this->application_deployment_queue->deployment_uuid;
        $this->pull_request_id = $this->application_deployment_queue->pull_request_id;
        $this->commit = $this->application_deployment_queue->commit;
+        $this->rollback = $this->application_deployment_queue->rollback;
        $this->force_rebuild = $this->application_deployment_queue->force_rebuild;
        $this->restart_only = $this->application_deployment_queue->restart_only;
        $this->only_this_server = $this->application_deployment_queue->only_this_server;
@ -789,9 +791,10 @@ private function save_environment_variables()
            "save" => "dotenv"
        ]);
        if (str($this->saved_outputs->get('dotenv'))->isNotEmpty()) {
+            $base64_dotenv = base64_encode($this->saved_outputs->get('dotenv')->value());
            $this->execute_remote_command(
                [
-                    "echo '{$this->saved_outputs->get('dotenv')->value()}' | tee $this->configuration_dir/.env > /dev/null"
+                    "echo '{$base64_dotenv}' | base64 -d | tee $this->configuration_dir/.env > /dev/null"
                ]
            );
        } else {
@ -1070,7 +1073,7 @@ private function check_git_if_build_needed()
                ],
            );
        }
-        if ($this->saved_outputs->get('git_commit_sha')) {
+        if ($this->saved_outputs->get('git_commit_sha') && !$this->rollback) {
            $this->commit = $this->saved_outputs->get('git_commit_sha')->before("\t");
        }
    }
--- a/app/Livewire/Project/Application/Rollback.php
+++ b/app/Livewire/Project/Application/Rollback.php
@ -18,7 +18,6 @@ public function mount()
    {
        $this->parameters = get_route_parameters();
    }
-
    public function rollbackImage($commit)
    {
        $deployment_uuid = new Cuid2(7);
@ -27,6 +26,7 @@ public function rollbackImage($commit)
            application: $this->application,
            deployment_uuid: $deployment_uuid,
            commit: $commit,
+            rollback: true,
            force_rebuild: false,
        );
        return redirect()->route('project.application.deployment.show', [
--- a/bootstrap/helpers/applications.php
+++ b/bootstrap/helpers/applications.php
@ -9,7 +9,7 @@
 use Illuminate\Support\Collection;
 use Spatie\Url\Url;

-function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $no_questions_asked = false, Server $server = null, StandaloneDocker $destination = null, bool $only_this_server = false)
+function queue_application_deployment(Application $application, string $deployment_uuid, int | null $pull_request_id = 0, string $commit = 'HEAD', bool $force_rebuild = false, bool $is_webhook = false, bool $restart_only = false, ?string $git_type = null, bool $no_questions_asked = false, Server $server = null, StandaloneDocker $destination = null, bool $only_this_server = false, bool $rollback = false)
 {
    $application_id = $application->id;
    $deployment_link = Url::fromString($application->link() . "/deployment/{$deployment_uuid}");
@ -38,6 +38,7 @@ function queue_application_deployment(Application $application, string $deployme
        'is_webhook' => $is_webhook,
        'restart_only' => $restart_only,
        'commit' => $commit,
+        'rollback' => $rollback,
        'git_type' => $git_type,
        'only_this_server' => $only_this_server
    ]);
--- 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.260',
+    'release' => '4.0.0-beta.261',
    // When left empty or `null` the Laravel environment will be used
    'environment' => config('app.env'),

--- a/config/version.php
+++ b/config/version.php
@ -1,3 +1,3 @@
 <?php

-return '4.0.0-beta.260';
+return '4.0.0-beta.261';
--- a/database/migrations/2024_04_17_132541_add_rollback_queues.php
+++ b/database/migrations/2024_04_17_132541_add_rollback_queues.php
@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->boolean('rollback')->default(false);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('application_deployment_queues', function (Blueprint $table) {
+            $table->dropColumn('rollback');
+        });
+    }
+};
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@ -95,7 +95,7 @@ services:
    expose:
      - "${APP_PORT:-8000}"
    healthcheck:
-      test: curl --fail http://localhost:80/api/health || exit 1
+      test: curl --fail http://127.0.0.1:80/api/health || exit 1
      interval: 5s
      retries: 10
      timeout: 2s
@ -142,7 +142,7 @@ services:
      SOKETI_DEFAULT_APP_KEY: "${PUSHER_APP_KEY}"
      SOKETI_DEFAULT_APP_SECRET: "${PUSHER_APP_SECRET}"
    healthcheck:
-      test: wget -qO- http://localhost:6001/ready || exit 1
+      test: wget -qO- http://127.0.0.1:6001/ready || exit 1
      interval: 5s
      retries: 10
      timeout: 2s
--- a/resources/views/livewire/project/application/configuration.blade.php
+++ b/resources/views/livewire/project/application/configuration.blade.php
@ -83,48 +83,48 @@
                <livewire:project.application.general :application="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'swarm'" class="h-full">
-                <livewire:project.application.swarm :application="$application" lazy />
+                <livewire:project.application.swarm :application="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'advanced'" class="h-full">
-                <livewire:project.application.advanced :application="$application" lazy />
+                <livewire:project.application.advanced :application="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'environment-variables'">
-                <livewire:project.shared.environment-variable.all :resource="$application" lazy />
+                <livewire:project.shared.environment-variable.all :resource="$application" />
            </div>
            @if ($application->git_based())
                <div x-cloak x-show="activeTab === 'source'">
-                    <livewire:project.application.source :application="$application" lazy />
+                    <livewire:project.application.source :application="$application" />
                </div>
            @endif
            <div x-cloak x-show="activeTab === 'servers'">
-                <livewire:project.shared.destination :resource="$application" :servers="$servers" lazy />
+                <livewire:project.shared.destination :resource="$application" :servers="$servers" />
            </div>
            <div x-cloak x-show="activeTab === 'storages'">
-                <livewire:project.service.storage :resource="$application" lazy />
+                <livewire:project.service.storage :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'webhooks'">
-                <livewire:project.shared.webhooks :resource="$application" lazy />
+                <livewire:project.shared.webhooks :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'previews'">
-                <livewire:project.application.previews :application="$application" lazy />
+                <livewire:project.application.previews :application="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'health'">
-                <livewire:project.shared.health-checks :resource="$application" lazy />
+                <livewire:project.shared.health-checks :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'rollback'">
-                <livewire:project.application.rollback :application="$application" lazy />
+                <livewire:project.application.rollback :application="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'resource-limits'">
-                <livewire:project.shared.resource-limits :resource="$application" lazy />
+                <livewire:project.shared.resource-limits :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'scheduled-tasks'">
-                <livewire:project.shared.scheduled-task.all :resource="$application" lazy />
+                <livewire:project.shared.scheduled-task.all :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'resource-operations'">
-                <livewire:project.shared.resource-operations :resource="$application" lazy />
+                <livewire:project.shared.resource-operations :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'tags'">
-                <livewire:project.shared.tags :resource="$application" lazy />
+                <livewire:project.shared.tags :resource="$application" />
            </div>
            <div x-cloak x-show="activeTab === 'danger'">
                <livewire:project.shared.danger :resource="$application" />
--- a/resources/views/livewire/project/application/previews.blade.php
+++ b/resources/views/livewire/project/application/previews.blade.php
@ -57,7 +57,7 @@ class="dark:text-warning">{{ $application->destination->server->name }}</span>.<
        <div class="pb-4">Previews</div>
        <div class="flex flex-wrap gap-6">
            @foreach ($application->previews as $preview)
-                <div class="flex flex-col p-4 dark:bg-coolgray-200">
+                <div class="flex flex-col p-4 dark:bg-coolgray-100">
                    <div class="flex gap-2">PR #{{ data_get($preview, 'pull_request_id') }} |
                        @if (Str::of(data_get($preview, 'status'))->startsWith('running'))
                            <x-status.running :status="data_get($preview, 'status')" />
@ -86,18 +86,20 @@ class="dark:text-warning">{{ $application->destination->server->name }}</span>.<
                                Redeploy
                            @endif
                        </x-forms.button>
-                        <a
-                            href="{{ route('project.application.deployment.index', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
-                            <x-forms.button class="dark:bg-coolgray-500">
-                                Deployment Logs
-                            </x-forms.button>
-                        </a>
-                        <a
-                            href="{{ route('project.application.logs', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
-                            <x-forms.button class="dark:bg-coolgray-500">
-                                Application Logs
-                            </x-forms.button>
-                        </a>
+                        @if (count($parameters) > 0)
+                            <a
+                                href="{{ route('project.application.deployment.index', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
+                                <x-forms.button class="dark:bg-coolgray-500">
+                                    Deployment Logs
+                                </x-forms.button>
+                            </a>
+                            <a
+                                href="{{ route('project.application.logs', [...$parameters, 'pull_request_id' => data_get($preview, 'pull_request_id')]) }}">
+                                <x-forms.button class="dark:bg-coolgray-500">
+                                    Application Logs
+                                </x-forms.button>
+                            </a>
+                        @endif
                        <x-forms.button isError class="dark:bg-coolgray-500"
                            wire:click="stop({{ data_get($preview, 'pull_request_id') }})">Delete
                        </x-forms.button>
--- a/resources/views/livewire/project/application/rollback.blade.php
+++ b/resources/views/livewire/project/application/rollback.blade.php
@ -9,7 +9,7 @@
        <div class="flex flex-wrap">
            @forelse ($images as $image)
                <div class="w-2/4 p-2">
-                    <div class="bg-white border rounded dark:border-bg-black dark:bg-coolgray-100">
+                    <div class="bg-white border rounded dark:border-black dark:bg-coolgray-100">
                        <div class="p-2">
                            <div class="">
                                @if (data_get($image, 'is_current'))
--- a/resources/views/livewire/project/service/configuration.blade.php
+++ b/resources/views/livewire/project/service/configuration.blade.php
@ -75,7 +75,8 @@
                                            <x-modal-input title="Edit Domains">
                                                <x-slot:content>
                                                    <span class="cursor-pointer">
-                                                        <svg xmlns="http://www.w3.org/2000/svg" class="w-4 h-4 dark:text-warning text-coollabs"
+                                                        <svg xmlns="http://www.w3.org/2000/svg"
+                                                            class="w-4 h-4 dark:text-warning text-coollabs"
                                                            viewBox="0 0 24 24">
                                                            <g fill="none" stroke="currentColor"
                                                                stroke-linecap="round" stroke-linejoin="round"
@ -89,7 +90,8 @@
                                                    </span>
                                                </x-slot:content>
                                                <livewire:project.service.edit-domain
-                                                    applicationId="{{ $application->id }}" wire:key="edit-domain-{{ $application->id }}" />
+                                                    applicationId="{{ $application->id }}"
+                                                    wire:key="edit-domain-{{ $application->id }}" />
                                            </x-modal-input>
                                        </span>
                                    @endif
@ -160,29 +162,29 @@
                <span class="dark:text-warning">Please modify storage layout in your Docker Compose file.</span>
                @foreach ($applications as $application)
                    <livewire:project.service.storage wire:key="application-{{ $application->id }}"
-                        :resource="$application" lazy />
+                        :resource="$application" />
                @endforeach
                @foreach ($databases as $database)
-                    <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" lazy />
+                    <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" />
                @endforeach
            </div>
            <div x-cloak x-show="activeTab === 'webhooks'">
-                <livewire:project.shared.webhooks :resource="$service" lazy />
+                <livewire:project.shared.webhooks :resource="$service" />
            </div>
            <div x-cloak x-show="activeTab === 'logs'">
-                <livewire:project.shared.logs :resource="$service"  />
+                <livewire:project.shared.logs :resource="$service" />
            </div>
            <div x-cloak x-show="activeTab === 'execute-command'">
-                <livewire:project.shared.execute-container-command :resource="$service"  />
+                <livewire:project.shared.execute-container-command :resource="$service" />
            </div>
            <div x-cloak x-show="activeTab === 'environment-variables'">
-                <livewire:project.shared.environment-variable.all :resource="$service" lazy />
+                <livewire:project.shared.environment-variable.all :resource="$service" />
            </div>
            <div x-cloak x-show="activeTab === 'resource-operations'">
-                <livewire:project.shared.resource-operations :resource="$service" lazy />
+                <livewire:project.shared.resource-operations :resource="$service" />
            </div>
            <div x-cloak x-show="activeTab === 'tags'">
-                <livewire:project.shared.tags :resource="$service" lazy />
+                <livewire:project.shared.tags :resource="$service" />
            </div>
            <div x-cloak x-show="activeTab === 'danger'">
                <livewire:project.shared.danger :resource="$service" />
--- a/versions.json
+++ b/versions.json
@ -1,7 +1,7 @@
 {
    "coolify": {
        "v4": {
-            "version": "4.0.0-beta.260"
+            "version": "4.0.0-beta.261"
        }
    }
 }