From f2c32b9aebf6344e9a57eeeb97510b3fe0079e4f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 9 Oct 2023 20:37:42 +0200
Subject: [PATCH] fixes

---
 app/Jobs/ContainerStatusJob.php                               | 4 ++--
 bootstrap/helpers/proxy.php                                   | 2 +-
 .../views/livewire/project/database/backup-edit.blade.php     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php
index 4f104f2ea..e175aeb8f 100644
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@@ -44,12 +44,12 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
-            ray("checking server status for {$this->server->name}");
+            // ray("checking server status for {$this->server->name}");
             // ray()->clearAll();
             $serverUptimeCheckNumber = $this->server->unreachable_count;
             $serverUptimeCheckNumberMax = 3;
 
-            ray('checking # ' . $serverUptimeCheckNumber);
+            // ray('checking # ' . $serverUptimeCheckNumber);
             if ($serverUptimeCheckNumber >= $serverUptimeCheckNumberMax) {
                 if ($this->server->unreachable_email_sent === false) {
                     ray('Server unreachable, sending notification...');
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index f3ee1fa77..316628958 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -247,7 +247,7 @@ EOF;
         "mkdir -p $configuration_dir",
         "echo '{$nginxconf_base64}' | base64 -d > $configuration_dir/nginx.conf",
         "echo '{$dockercompose_base64}' | base64 -d > $configuration_dir/docker-compose.yaml",
-        "docker compose --project-directory {$configuration_dir} up -d >/dev/null",
+        "docker compose --project-directory {$configuration_dir} up -d --remove-orphans >/dev/null",
 
 
     ], $database->destination->server);
diff --git a/resources/views/livewire/project/database/backup-edit.blade.php b/resources/views/livewire/project/database/backup-edit.blade.php
index f7f7afa8e..4450d209a 100644
--- a/resources/views/livewire/project/database/backup-edit.blade.php
+++ b/resources/views/livewire/project/database/backup-edit.blade.php
@@ -16,7 +16,7 @@
     @if ($backup->save_s3)
         <div class="pb-6">
             <x-forms.select id="backup.s3_storage_id" label="S3 Storage" required>
-                <option value="default" disabled>Select a S3 storage</option>
+                <option value="default">Select a S3 storage</option>
                 @foreach ($s3s as $s3)
                     <option value="{{ $s3->id }}">{{ $s3->name }}</option>
                 @endforeach