From bb435b082ec040e2cfc6d9d1d90a1c726273b767 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Fri, 31 Mar 2023 11:51:04 +0200 Subject: [PATCH] save --- app/Http/Livewire/DeployApplication.php | 13 ++++++------- docker/builder/Dockerfile | 2 +- resources/views/livewire/poll-activity.blade.php | 3 ++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/Http/Livewire/DeployApplication.php b/app/Http/Livewire/DeployApplication.php index 14401a1fc..342e2e2f3 100644 --- a/app/Http/Livewire/DeployApplication.php +++ b/app/Http/Livewire/DeployApplication.php @@ -41,11 +41,11 @@ class DeployApplication extends Component } private function execute_in_builder(string $command) { - if ($this->application->settings->is_debug) { - return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'"; - } else { - return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}' > /dev/null 2>&1"; - } + return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'"; + // if ($this->application->settings->is_debug) { + // } else { + // return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'"; + // } } private function start_builder_container() { @@ -247,10 +247,9 @@ class DeployApplication extends Component public function stop() { - $output = runRemoteCommandSync($this->destination->server, ["docker rm -f {$this->application_uuid} >/dev/null 2>&1"]); + runRemoteCommandSync($this->destination->server, ["docker rm -f {$this->application_uuid} >/dev/null 2>&1"]); $this->application->status = 'exited'; $this->application->save(); - // $this->application->refresh(); } public function pollingStatus() { diff --git a/docker/builder/Dockerfile b/docker/builder/Dockerfile index 32099603b..bbeca59b1 100644 --- a/docker/builder/Dockerfile +++ b/docker/builder/Dockerfile @@ -22,5 +22,5 @@ RUN curl -sSL https://nixpacks.com/install.sh | bash RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack ENTRYPOINT ["/sbin/tini", "--"] -CMD ["sh", "-c", "while true; do sleep 1000; done"] +CMD ["sh", "-c", "while true; do sleep 69420; done"] diff --git a/resources/views/livewire/poll-activity.blade.php b/resources/views/livewire/poll-activity.blade.php index 8c69b96de..389483dc1 100644 --- a/resources/views/livewire/poll-activity.blade.php +++ b/resources/views/livewire/poll-activity.blade.php @@ -1,5 +1,6 @@
@isset($activity?->id) -
{{ data_get($activity, 'description') ?? 'Logs will be here soon...' }}
+
{{ data_get($activity, 'description') }}
@endisset + {{--
{{ data_get($activity, 'properties') }}
--}}