dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
Andras Bacsai
2023-03-31 11:51:04 +02:00
parent e052047b04
commit bb435b082e
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Livewire/DeployApplication.php
View File

@@ -41,11 +41,11 @@ class DeployApplication extends Component
} }
private function execute_in_builder(string $command) private function execute_in_builder(string $command)
{ {
if ($this->application->settings->is_debug) { return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'";
return $this->command[] = "docker exec {$this->deployment_uuid} bash -c '{$command}'"; // if ($this->application->settings->is_debug) {
} else { // } 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}'";
} // }
} }
private function start_builder_container() private function start_builder_container()
{ {
@@ -247,10 +247,9 @@ class DeployApplication extends Component
public function stop() 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->status = 'exited';
$this->application->save(); $this->application->save();
// $this->application->refresh();
} }
public function pollingStatus() public function pollingStatus()
{ {

2
docker/builder/Dockerfile
View File

@@ -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 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker /usr/local/bin/pack
ENTRYPOINT ["/sbin/tini", "--"] ENTRYPOINT ["/sbin/tini", "--"]
CMD ["sh", "-c", "while true; do sleep 1000; done"] CMD ["sh", "-c", "while true; do sleep 69420; done"]

3
resources/views/livewire/poll-activity.blade.php
View File

@@ -1,5 +1,6 @@
<div> <div>
@isset($activity?->id) @isset($activity?->id)
<pre style="width: 100%;overflow-y: scroll;" @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif>{{ data_get($activity, 'description') ?? 'Logs will be here soon...' }}</pre> <pre style="width: 100%;overflow-y: scroll;" @if ($isKeepAliveOn) wire:poll.750ms="polling" @endif>{{ data_get($activity, 'description') }}</pre>
@endisset @endisset
{{-- <pre style="width: 100%;overflow-y: scroll;">{{ data_get($activity, 'properties') }}</pre> --}}
</div> </div>