From b3cdd7df3c66c64f207e1fee826ca365422b66a5 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 8 Jun 2023 10:29:44 +0200
Subject: [PATCH] wip

---
 app/Jobs/ApplicationDeploymentJob.php | 4 ++--
 bootstrap/helpers/proxy.php           | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index d962fa6a6..cb22601b6 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -177,9 +177,9 @@ class ApplicationDeploymentJob implements ShouldQueue
             "echo -n 'Building image... '",
         ]);
 
-        if ($this->application->settings->is_static && isset($this->application->build_command)) {
+        if ($this->application->settings->is_static) {
             $this->execute_now([
-                $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t { $this->build_image_name {$this->workdir}"),
+                $this->execute_in_builder("docker build -f {$this->workdir}/Dockerfile {$this->build_args} --progress plain -t $this->build_image_name {$this->workdir}"),
             ], isDebuggable: true);
 
             $dockerfile = "FROM {$this->application->static_image}
diff --git a/bootstrap/helpers/proxy.php b/bootstrap/helpers/proxy.php
index 7290ac834..788d85455 100644
--- a/bootstrap/helpers/proxy.php
+++ b/bootstrap/helpers/proxy.php
@@ -39,11 +39,19 @@ if (!function_exists('getProxyConfiguration')) {
                         "443:443",
                         "8080:8080",
                     ],
+                    "healthcheck" => [
+                        "test" => "wget -qO- http://localhost:80/ping || exit 1",
+                        "interval" => "4s",
+                        "timeout" => "2s",
+                        "retries" => 5,
+                    ],
                     "volumes" => [
                         "/var/run/docker.sock:/var/run/docker.sock:ro",
                         "{$proxy_path}:/traefik",
                     ],
                     "command" => [
+                        "--ping=true",
+                        "--ping.entrypoint=http",
                         "--api.dashboard=true",
                         "--api.insecure=true",
                         "--entrypoints.http.address=:80",