diff --git a/app/Http/Livewire/Server/Form.php b/app/Http/Livewire/Server/Form.php index 7b512f066..d1d90d21c 100644 --- a/app/Http/Livewire/Server/Form.php +++ b/app/Http/Livewire/Server/Form.php @@ -26,8 +26,9 @@ public function mount() public function installDocker() { $config = base64_encode('{ "live-restore": true }'); - runRemoteCommandSync($this->server, ["mkdir -p /etc/docker/", "touch /etc/docker/daemon.json", "echo '{$config}' | base64 -d > /etc/docker/daemon.json"]); - runRemoteCommandSync($this->server, ['sh -c "$(curl --silent -fsSL https://get.docker.com)"']); + runRemoteCommandSync($this->server, [ + "curl https://releases.rancher.com/install-docker/23.0.sh | sh" + ]); } public function checkConnection() { diff --git a/bootstrap/helpers.php b/bootstrap/helpers.php index 7e86b016c..36ee4cdac 100644 --- a/bootstrap/helpers.php +++ b/bootstrap/helpers.php @@ -78,6 +78,7 @@ function generateSshCommand(string $private_key_location, string $server_ip, str $ssh_command .= "-i {$private_key_location} " . '-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ' . '-o PasswordAuthentication=no ' + . '-o ConnectTimeout=3600 ' . '-o RequestTTY=no ' . '-o LogLevel=ERROR ' . "-p {$port} " diff --git a/scripts/run b/scripts/run index fca172e01..f7e56234e 100755 --- a/scripts/run +++ b/scripts/run @@ -45,7 +45,9 @@ function coolify-root { function vite { bash vendor/bin/spin exec vite bash } - +function build-builder { + act -W .github/workflows/coolify-builder.yml --secret-file .env.secrets +} function default { help }