diff --git a/app/Jobs/ApplicationDeploymentJob.php b/app/Jobs/ApplicationDeploymentJob.php
index df166c1cd..24565b389 100644
--- a/app/Jobs/ApplicationDeploymentJob.php
+++ b/app/Jobs/ApplicationDeploymentJob.php
@@ -1442,14 +1442,24 @@ class ApplicationDeploymentJob implements ShouldBeEncrypted, ShouldQueue
if ($this->pull_request_id !== 0) {
$local_branch = "pull/{$this->pull_request_id}/head";
}
- $private_key = $this->application->privateKey?->getKeyLocation();
+ $private_key = data_get($this->application, 'private_key.private_key');
if ($private_key) {
+ $private_key = base64_encode($private_key);
$this->execute_remote_command(
[
- executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i {$private_key}\" git ls-remote {$this->fullRepoUrl} {$local_branch}"),
+ executeInDocker($this->deployment_uuid, 'mkdir -p /root/.ssh'),
+ ],
+ [
+ executeInDocker($this->deployment_uuid, "echo '{$private_key}' | base64 -d | tee /root/.ssh/id_rsa > /dev/null"),
+ ],
+ [
+ executeInDocker($this->deployment_uuid, 'chmod 600 /root/.ssh/id_rsa'),
+ ],
+ [
+ executeInDocker($this->deployment_uuid, "GIT_SSH_COMMAND=\"ssh -o ConnectTimeout=30 -p {$this->customPort} -o Port={$this->customPort} -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null\" git ls-remote {$this->fullRepoUrl} {$local_branch}"),
'hidden' => true,
'save' => 'git_commit_sha',
- ],
+ ]
);
} else {
$this->execute_remote_command(
diff --git a/app/Livewire/Project/Shared/Terminal.php b/app/Livewire/Project/Shared/Terminal.php
index 5fd098e9f..27be46227 100644
--- a/app/Livewire/Project/Shared/Terminal.php
+++ b/app/Livewire/Project/Shared/Terminal.php
@@ -9,6 +9,20 @@ use Livewire\Component;
class Terminal extends Component
{
+ public function getListeners()
+ {
+ $teamId = auth()->user()->currentTeam()->id;
+
+ return [
+ "echo-private:team.{$teamId},ApplicationStatusChanged" => 'closeTerminal',
+ ];
+ }
+
+ public function closeTerminal()
+ {
+ $this->dispatch('reloadWindow');
+ }
+
#[On('send-terminal-command')]
public function sendTerminalCommand($isContainer, $identifier, $serverUuid)
{
diff --git a/config/sentry.php b/config/sentry.php
index 60e183283..46c4407f2 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.343',
+ 'release' => '4.0.0-beta.344',
// 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 050ea885b..a4ecf5bf6 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,3 +1,3 @@
0,
'name' => 'localhost',
@@ -89,7 +89,7 @@ class ProductionSeeder extends Seeder
$server->settings->is_usable = true;
$server->settings->save();
}
- if (StandaloneDocker::find(0) == null) {
+ if (StandaloneDocker::find(0) == null && ! isCloud()) {
StandaloneDocker::create([
'id' => 0,
'name' => 'localhost-coolify',
diff --git a/other/nightly/install.sh b/other/nightly/install.sh
index 020e7d45b..feb97295a 100755
--- a/other/nightly/install.sh
+++ b/other/nightly/install.sh
@@ -8,7 +8,7 @@ set -o pipefail # Cause a pipeline to return the status of the last command that
CDN="https://cdn.coollabs.io/coolify-nightly"
DATE=$(date +"%Y%m%d-%H%M%S")
-VERSION="1.5"
+VERSION="1.6"
DOCKER_VERSION="26.0"
# TODO: Ask for a user
CURRENT_USER=$USER
@@ -39,6 +39,11 @@ if [ "$OS_TYPE" = "manjaro" ] || [ "$OS_TYPE" = "manjaro-arm" ]; then
OS_TYPE="arch"
fi
+# Check if the OS is Asahi Linux, if so, change it to fedora
+if [ "$OS_TYPE" = "fedora-asahi-remix" ]; then
+ OS_TYPE="fedora"
+fi
+
# Check if the OS is popOS, if so, change it to ubuntu
if [ "$OS_TYPE" = "pop" ]; then
OS_TYPE="ubuntu"
diff --git a/other/nightly/versions.json b/other/nightly/versions.json
index 8bfd2b810..aa17c449a 100644
--- a/other/nightly/versions.json
+++ b/other/nightly/versions.json
@@ -1,10 +1,10 @@
{
"coolify": {
"v4": {
- "version": "4.0.0-beta.343"
+ "version": "4.0.0-beta.344"
},
"nightly": {
- "version": "4.0.0-beta.344"
+ "version": "4.0.0-beta.345"
},
"helper": {
"version": "1.0.1"
diff --git a/resources/views/livewire/project/shared/execute-container-command.blade.php b/resources/views/livewire/project/shared/execute-container-command.blade.php
index 0a406e152..c98e9ae19 100644
--- a/resources/views/livewire/project/shared/execute-container-command.blade.php
+++ b/resources/views/livewire/project/shared/execute-container-command.blade.php
@@ -32,7 +32,7 @@