From a4d358d512ea05081b4485d8757877fae1ca7956 Mon Sep 17 00:00:00 2001
From: Seii <seii@users.noreply.github.com>
Date: Mon, 16 Oct 2023 22:11:51 -0600
Subject: [PATCH 1/7] Add Raspbian support to install.sh

---
 scripts/install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install.sh b/scripts/install.sh
index c6f702c9b..9ea40c8c2 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -18,7 +18,7 @@ if [ $EUID != 0 ]; then
     echo "Please run as root"
     exit
 fi
-if [ $OS_TYPE != "ubuntu" ] && [ $OS_TYPE != "debian" ]; then
+if [ $OS_TYPE != "ubuntu" ] && [ $OS_TYPE != "debian" ] && [ $OS_TYPE != "raspbian" ]; then
     echo "This script only supports Ubuntu and Debian for now."
     exit
 fi

From 36dc4797723c3b8e4180eace397675ee9fc61980 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Oct 2023 10:17:03 +0200
Subject: [PATCH 2/7] fix: service status check is a bit better

---
 app/Http/Livewire/Project/Service/Navbar.php              | 1 +
 app/Http/Livewire/Project/Service/StackForm.php           | 2 +-
 config/sentry.php                                         | 2 +-
 config/version.php                                        | 2 +-
 resources/views/livewire/project/service/navbar.blade.php | 2 +-
 versions.json                                             | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/Http/Livewire/Project/Service/Navbar.php b/app/Http/Livewire/Project/Service/Navbar.php
index d85c6f435..b8e604ad4 100644
--- a/app/Http/Livewire/Project/Service/Navbar.php
+++ b/app/Http/Livewire/Project/Service/Navbar.php
@@ -34,5 +34,6 @@ class Navbar extends Component
         StopService::run($this->service);
         $this->service->refresh();
         $this->emit('success', 'Service stopped successfully.');
+        $this->checkStatus();
     }
 }
diff --git a/app/Http/Livewire/Project/Service/StackForm.php b/app/Http/Livewire/Project/Service/StackForm.php
index 1518e3d22..2c1fa5495 100644
--- a/app/Http/Livewire/Project/Service/StackForm.php
+++ b/app/Http/Livewire/Project/Service/StackForm.php
@@ -6,6 +6,7 @@ use Livewire\Component;
 
 class StackForm extends Component
 {
+    public $service;
     protected $listeners = ["saveCompose"];
     protected $rules = [
         'service.docker_compose_raw' => 'required',
@@ -13,7 +14,6 @@ class StackForm extends Component
         'service.name' => 'required',
         'service.description' => 'nullable',
     ];
-    public $service;
     public function saveCompose($raw)
     {
         $this->service->docker_compose_raw = $raw;
diff --git a/config/sentry.php b/config/sentry.php
index 9631be2fd..0436da59d 100644
--- a/config/sentry.php
+++ b/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.86',
+    'release' => '4.0.0-beta.87',
     // 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 86fe50176..58b3026ae 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.86';
+return '4.0.0-beta.87';
diff --git a/resources/views/livewire/project/service/navbar.blade.php b/resources/views/livewire/project/service/navbar.blade.php
index 0825c2c7f..d662f026a 100644
--- a/resources/views/livewire/project/service/navbar.blade.php
+++ b/resources/views/livewire/project/service/navbar.blade.php
@@ -1,4 +1,4 @@
-<div x-init="$wire.checkStatus">
+<div x-init="$wire.checkStatus" wire:poll.2500ms='checkStatus'>
     <livewire:project.service.modal />
     <h1>Configuration</h1>
     <x-resources.breadcrumbs :resource="$service" :parameters="$parameters" />
diff --git a/versions.json b/versions.json
index 830ae81a4..aa5dabcd4 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.86"
+            "version": "4.0.0-beta.87"
         }
     }
 }

From 16cbca36c167900e634796ebce5d40659de6b9ed Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Oct 2023 10:37:26 +0200
Subject: [PATCH 3/7] add trademark policy

---
 resources/views/livewire/project/new/select.blade.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php
index 5edd410b5..8d6636fb1 100644
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@@ -152,6 +152,9 @@
                     @endforeach
                 @endif
             </div>
+            <div class="py-4 pb-10">Trademarks Policy: The respective trademarks mentioned here are owned by the
+                respective
+                companies, and use of them does not imply any affiliation or endorsement.</div>
         @endif
         @if ($current_step === 'servers')
             <ul class="pb-10 steps">

From fbb5f2ca2ef64e0bfb5a36f8e34443f7f3f6069e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Oct 2023 10:37:39 +0200
Subject: [PATCH 4/7] fix: generate fqdn if you deleted a service app, but it
 requires fqdn

---
 app/Models/Service.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Service.php b/app/Models/Service.php
index a8a9570f8..4fbb6a1f7 100644
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@@ -382,7 +382,7 @@ class Service extends BaseModel
                         $value = Str::of($variable);
                     }
                     if ($key->startsWith('SERVICE_FQDN')) {
-                        if ($isNew) {
+                        if ($isNew || $savedService->fqdn === null) {
                             $name = $key->after('SERVICE_FQDN_')->beforeLast('_')->lower();
                             $fqdn = generateFqdn($this->server, "{$name->value()}-{$this->uuid}");
                             if (substr_count($key->value(), '_') === 3) {

From 5d95d8b79a08cf1c5e8002f9c8be4ca11e37af9f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Oct 2023 11:10:33 +0200
Subject: [PATCH 5/7] fix: cancel any deployments + queue next

---
 .../Livewire/Project/Application/DeploymentNavbar.php     | 8 ++++++--
 .../project/application/deployment-navbar.blade.php       | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Http/Livewire/Project/Application/DeploymentNavbar.php b/app/Http/Livewire/Project/Application/DeploymentNavbar.php
index b0cad0395..0cdb895c8 100644
--- a/app/Http/Livewire/Project/Application/DeploymentNavbar.php
+++ b/app/Http/Livewire/Project/Application/DeploymentNavbar.php
@@ -60,12 +60,16 @@ class DeploymentNavbar extends Component
                 $previous_logs[] = $new_log_entry;
                 $this->application_deployment_queue->update([
                     'logs' => json_encode($previous_logs, flags: JSON_THROW_ON_ERROR),
-                    'current_process_id' => null,
-                    'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
                 ]);
             }
         } catch (\Throwable $e) {
             return handleError($e, $this);
+        } finally {
+            $this->application_deployment_queue->update([
+                'current_process_id' => null,
+                'status' => ApplicationDeploymentStatus::CANCELLED_BY_USER->value,
+            ]);
+            queue_next_deployment($this->application);
         }
     }
 }
diff --git a/resources/views/livewire/project/application/deployment-navbar.blade.php b/resources/views/livewire/project/application/deployment-navbar.blade.php
index 28866083f..d42fb2298 100644
--- a/resources/views/livewire/project/application/deployment-navbar.blade.php
+++ b/resources/views/livewire/project/application/deployment-navbar.blade.php
@@ -7,6 +7,6 @@
     @endif
     @if (data_get($application_deployment_queue, 'status') === 'in_progress' ||
             data_get($application_deployment_queue, 'status') === 'queued')
-        <x-forms.button wire:click.prevent="cancel">Cancel deployment</x-forms.button>
+        <x-forms.button wire:click.prevent="cancel">Cancel Deployment</x-forms.button>
     @endif
 </div>

From f5ae222a6efc900df7781737ba427b62fbfcddb5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Oct 2023 11:23:49 +0200
Subject: [PATCH 6/7] fix: add internal domain names during build process

---
 app/Jobs/ApplicationDeploymentJob.php | 33 +++++++++++++++++++++++----
 app/Jobs/ContainerStatusJob.php       |  2 +-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index 3b9c74b90..e5f068d61 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -67,7 +67,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private $docker_compose;
     private $docker_compose_base64;
     private string $dockerfile_location = '/Dockerfile';
-
+    private ?string $addHosts = null;
     private $log_model;
     private Collection $saved_outputs;
 
@@ -98,7 +98,6 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->configuration_dir = application_configuration_dir() . "/{$this->application->uuid}";
         $this->is_debug_enabled = $this->application->settings->is_debug_enabled;
 
-        ray($this->basedir, $this->workdir);
         $this->container_name = generateApplicationContainerName($this->application, $this->pull_request_id);
         savePrivateKeyToFs($this->server);
         $this->saved_outputs = collect();
@@ -138,6 +137,29 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         $this->application_deployment_queue->update([
             'status' => ApplicationDeploymentStatus::IN_PROGRESS->value,
         ]);
+
+        // Generate custom host<->ip mapping
+        $allContainers = instant_remote_process(["docker network inspect {$this->destination->network} -f '{{json .Containers}}' "], $this->server);
+        $allContainers = format_docker_command_output_to_json($allContainers);
+        $ips = collect([]);
+        if (count($allContainers) > 0) {
+            $allContainers = $allContainers[0];
+            foreach ($allContainers as $container) {
+                $containerName = data_get($container, 'Name');
+                if ($containerName === 'coolify-proxy') {
+                    continue;
+                }
+                $containerIp = data_get($container, 'IPv4Address');
+                if ($containerName && $containerIp) {
+                    $containerIp = str($containerIp)->before('/');
+                    $ips->put($containerName, $containerIp->value());
+                }
+            }
+        }
+        $this->addHosts = $ips->map(function ($ip, $name) {
+            return "--add-host $name:$ip";
+        })->implode(' ');
+
         try {
             if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -766,7 +788,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
 
         if ($this->application->settings->is_static) {
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"), "hidden" => true
             ]);
 
             $dockerfile = base64_encode("FROM {$this->application->static_image}
@@ -799,12 +821,13 @@ COPY ./nginx.conf /etc/nginx/conf.d/default.conf");
                     executeInDocker($this->deployment_uuid, "echo '{$nginx_config}' | base64 -d > {$this->workdir}/nginx.conf")
                 ],
                 [
-                    executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                    executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}/Dockerfile-prod {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
                 ]
             );
         } else {
+            ray("docker build $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}");
             $this->execute_remote_command([
-                executeInDocker($this->deployment_uuid, "docker build --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
+                executeInDocker($this->deployment_uuid, "docker build $this->addHosts --network host -f {$this->workdir}{$this->dockerfile_location} {$this->build_args} --progress plain -t $this->production_image_name {$this->workdir}"), "hidden" => true
             ]);
         }
     }
diff --git a/app/Jobs/ContainerStatusJob.php b/app/Jobs/ContainerStatusJob.php
index b68a7c89b..4f379ec65 100644
--- a/app/Jobs/ContainerStatusJob.php
+++ b/app/Jobs/ContainerStatusJob.php
@@ -47,7 +47,7 @@ class ContainerStatusJob implements ShouldQueue, ShouldBeEncrypted
     public function handle()
     {
         try {
-            ray("checking server status for {$this->server->id}");
+            // ray("checking server status for {$this->server->id}");
             // ray()->clearAll();
             $serverUptimeCheckNumber = $this->server->unreachable_count;
             $serverUptimeCheckNumberMax = 3;

From fd488a561a17ffe4204378876227244b684d7365 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 17 Oct 2023 12:35:04 +0200
Subject: [PATCH 7/7] feat: use docker login credentials from server

---
 app/Jobs/ApplicationDeploymentJob.php | 9 +++++++--
 config/sentry.php                     | 2 +-
 config/version.php                    | 2 +-
 versions.json                         | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index e5f068d61..ff4228ac5 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -71,6 +71,9 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     private $log_model;
     private Collection $saved_outputs;
 
+    private string $serverUser = 'root';
+    private string $serverUserHomeDir = '/root';
+
     public $tries = 1;
     public function __construct(int $application_deployment_queue_id)
     {
@@ -92,7 +95,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
         }
         $this->destination = $this->application->destination->getMorphClass()::where('id', $this->application->destination->id)->first();
         $this->server = $this->destination->server;
-
+        $this->serverUser = $this->server->user;
         $this->basedir = "/artifacts/{$this->deployment_uuid}";
         $this->workdir = "{$this->basedir}" . rtrim($this->application->base_directory, '/');
         $this->configuration_dir = application_configuration_dir() . "/{$this->application->uuid}";
@@ -160,6 +163,8 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
             return "--add-host $name:$ip";
         })->implode(' ');
 
+        // Get user home directory
+        $this->serverUserHomeDir = instant_remote_process(["echo \$HOME"], $this->server);
         try {
             if ($this->application->dockerfile) {
                 $this->deploy_simple_dockerfile();
@@ -458,7 +463,7 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
     {
         $pull = "--pull=always";
         $helperImage = config('coolify.helper_image');
-        $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host  --name {$this->deployment_uuid} --rm -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
+        $runCommand = "docker run {$pull} -d --network {$this->destination->network} -v /:/host  --name {$this->deployment_uuid} --rm -v {$this->serverUserHomeDir}/.docker/config.json:/root/.docker/config.json:ro -v /var/run/docker.sock:/var/run/docker.sock {$helperImage}";
 
         $this->execute_remote_command(
             [
diff --git a/config/sentry.php b/config/sentry.php
index 0436da59d..f0fda5f19 100644
--- a/config/sentry.php
+++ b/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.87',
+    'release' => '4.0.0-beta.88',
     // 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 58b3026ae..8de2939a1 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.87';
+return '4.0.0-beta.88';
diff --git a/versions.json b/versions.json
index aa5dabcd4..1a37a7d61 100644
--- a/versions.json
+++ b/versions.json
@@ -4,7 +4,7 @@
             "version": "3.12.36"
         },
         "v4": {
-            "version": "4.0.0-beta.87"
+            "version": "4.0.0-beta.88"
         }
     }
 }