Merge pull request #3583 from coollabsio/next

v4.0.0-beta.345

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(

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)
     {

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.345',
     // When left empty or `null` the Laravel environment will be used
     'environment' => config('app.env'),
 

config/version.php

@@ -1,3 +1,3 @@
 <?php
 
-return '4.0.0-beta.343';
+return '4.0.0-beta.345';

database/seeders/ProductionSeeder.php

@@ -65,37 +65,39 @@ class ProductionSeeder extends Seeder
             ]);
         }
         // Add Coolify host (localhost) as Server if it doesn't exist
-        if (Server::find(0) == null) {
-            $server_details = [
-                'id' => 0,
-                'name' => 'localhost',
-                'description' => "This is the server where Coolify is running on. Don't delete this!",
-                'user' => 'root',
-                'ip' => 'host.docker.internal',
-                'team_id' => 0,
-                'private_key_id' => 0,
-            ];
-            $server_details['proxy'] = ServerMetadata::from([
-                'type' => ProxyTypes::TRAEFIK->value,
-                'status' => ProxyStatus::EXITED->value,
-            ]);
-            $server = Server::create($server_details);
-            $server->settings->is_reachable = true;
-            $server->settings->is_usable = true;
-            $server->settings->save();
-        } else {
-            $server = Server::find(0);
-            $server->settings->is_reachable = true;
-            $server->settings->is_usable = true;
-            $server->settings->save();
-        }
-        if (StandaloneDocker::find(0) == null) {
-            StandaloneDocker::create([
-                'id' => 0,
-                'name' => 'localhost-coolify',
-                'network' => 'coolify',
-                'server_id' => 0,
-            ]);
+        if (! isCloud()) {
+            if (Server::find(0) == null) {
+                $server_details = [
+                    'id' => 0,
+                    'name' => 'localhost',
+                    'description' => "This is the server where Coolify is running on. Don't delete this!",
+                    'user' => 'root',
+                    'ip' => 'host.docker.internal',
+                    'team_id' => 0,
+                    'private_key_id' => 0,
+                ];
+                $server_details['proxy'] = ServerMetadata::from([
+                    'type' => ProxyTypes::TRAEFIK->value,
+                    'status' => ProxyStatus::EXITED->value,
+                ]);
+                $server = Server::create($server_details);
+                $server->settings->is_reachable = true;
+                $server->settings->is_usable = true;
+                $server->settings->save();
+            } else {
+                $server = Server::find(0);
+                $server->settings->is_reachable = true;
+                $server->settings->is_usable = true;
+                $server->settings->save();
+            }
+            if (StandaloneDocker::find(0) == null) {
+                StandaloneDocker::create([
+                    'id' => 0,
+                    'name' => 'localhost-coolify',
+                    'network' => 'coolify',
+                    'server_id' => 0,
+                ]);
+            }
         }
 
         if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) {
@@ -112,8 +114,8 @@ class ProductionSeeder extends Seeder
                 }
             } else {
                 if ($coolify_key) {
-                    $coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
                     $user = str($coolify_key)->before('@')->after('id.');
+                    $coolify_key = Storage::disk('ssh-keys')->get($coolify_key);
                     PrivateKey::create([
                         'id' => 0,
                         'team_id' => 0,

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"

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"

resources/views/livewire/project/service/configuration.blade.php

@@ -76,7 +76,7 @@
                                     @endif
                                     @if ($application->fqdn)
                                         <span class="flex gap-1 text-xs">{{ Str::limit($application->fqdn, 60) }}
-                                            <x-modal-input title="Edit Domains">
+                                            <x-modal-input title="Edit Domains" :closeOutside="false">
                                                 <x-slot:content>
                                                     <span class="cursor-pointer">
                                                         <svg xmlns="http://www.w3.org/2000/svg"
@@ -107,15 +107,14 @@
                                         Settings
                                     </a>
                                     @if (str($application->status)->contains('running'))
-                                        <x-modal-confirmation 
-                                        title="Confirm Service Application Restart?"
-                                        buttonTitle="Restart"
-                                        submitAction="restartApplication({{ $application->id }})"
-                                        :actions="['The selected service application will be unavailable during the restart.', 'If the service application is currently in use data could be lost.']"
-                                        :confirmWithText="false"
-                                        :confirmWithPassword="false"
-                                        step2ButtonText="Restart Service Container"
-                                        />
+                                        <x-modal-confirmation title="Confirm Service Application Restart?"
+                                            buttonTitle="Restart"
+                                            submitAction="restartApplication({{ $application->id }})" :actions="[
+                                                'The selected service application will be unavailable during the restart.',
+                                                'If the service application is currently in use data could be lost.',
+                                            ]"
+                                            :confirmWithText="false" :confirmWithPassword="false"
+                                            step2ButtonText="Restart Service Container" />
                                     @endif
                                 </div>
                             </div>
@@ -155,15 +154,13 @@
                                         Settings
                                     </a>
                                     @if (str($database->status)->contains('running'))
-                                        <x-modal-confirmation
-                                        title="Confirm Service Database Restart?"
-                                        buttonTitle="Restart"
-                                        submitAction="restartDatabase({{ $database->id }})"
-                                        :actions="['This service database will be unavailable during the restart.', 'If the service database is currently in use data could be lost.']"
-                                        :confirmWithText="false"
-                                        :confirmWithPassword="false"
-                                        step2ButtonText="Restart Database"
-                                        />
+                                        <x-modal-confirmation title="Confirm Service Database Restart?"
+                                            buttonTitle="Restart" submitAction="restartDatabase({{ $database->id }})"
+                                            :actions="[
+                                                'This service database will be unavailable during the restart.',
+                                                'If the service database is currently in use data could be lost.',
+                                            ]" :confirmWithText="false" :confirmWithPassword="false"
+                                            step2ButtonText="Restart Database" />
                                     @endif
                                 </div>
                             </div>
@@ -183,7 +180,8 @@
                         lazy />
                 @endforeach
                 @foreach ($databases as $database)
-                    <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database" lazy />
+                    <livewire:project.service.storage wire:key="database-{{ $database->id }}" :resource="$database"
+                        lazy />
                 @endforeach
             </div>
             <div x-cloak x-show="activeTab === 'scheduled-tasks'">

resources/views/livewire/project/shared/execute-container-command.blade.php

@@ -32,7 +32,7 @@
                     <x-forms.button type="submit">Connect</x-forms.button>
                 </form>
             @else
-                <div class="pt-4">No containers are not running.</div>
+                <div class="pt-4">No containers are running.</div>
             @endif
         </div>
     </div>

scripts/install.sh

@@ -10,6 +10,8 @@ DATE=$(date +"%Y%m%d-%H%M%S")
 
 VERSION="1.6"
 DOCKER_VERSION="26.0"
+# TODO: Ask for a user
+CURRENT_USER=$USER
 
 mkdir -p /data/coolify/{source,ssh,applications,databases,backups,services,proxy,webhooks-during-maintenance,metrics,logs}
 mkdir -p /data/coolify/ssh/{keys,mux}
@@ -401,88 +403,18 @@ if [ ! -f ~/.ssh/authorized_keys ]; then
     chmod 600 ~/.ssh/authorized_keys
 fi
 
-checkSshKeyInAuthorizedKeys() {
-    grep -qw "root@coolify" ~/.ssh/authorized_keys
-    return $?
-}
+set +e
+IS_COOLIFY_VOLUME_EXISTS=$(docker volume ls | grep coolify-db | wc -l)
+set -e
 
-checkSshKeyInCoolifyData() {
-    [ -s /data/coolify/ssh/keys/id.root@host.docker.internal ]
-    return $?
-}
-
-generateAuthorizedKeys() {
-    sed -i "/root@coolify/d" ~/.ssh/authorized_keys
-    cat /data/coolify/ssh/keys/id.root@host.docker.internal.pub >> ~/.ssh/authorized_keys
-    rm -f /data/coolify/ssh/keys/id.root@host.docker.internal.pub
-}
-generateSshKey() {
+if [ "$IS_COOLIFY_VOLUME_EXISTS" -eq 0 ]; then
     echo " - Generating SSH key."
-    ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.root@host.docker.internal -q -N "" -C root@coolify
-    chown 9999 /data/coolify/ssh/keys/id.root@host.docker.internal
-    generateAuthorizedKeys
-}
-
-syncSshKeys() {
-    DB_RUNNING=$(docker inspect coolify-db --format '{{ .State.Status }}' 2>/dev/null)
-    # Check if SSH key exists in Coolify data but not in authorized_keys
-    if checkSshKeyInCoolifyData && ! checkSshKeyInAuthorizedKeys; then
-        # Add the existing Coolify SSH key to authorized_keys
-        cat /data/coolify/ssh/keys/id.root@host.docker.internal.pub >> ~/.ssh/authorized_keys
-    # Check if SSH key exists in authorized_keys but not in Coolify data
-    elif checkSshKeyInAuthorizedKeys && ! checkSshKeyInCoolifyData; then
-        # Ensure Coolify DB is running before proceeding
-        if [ "$DB_RUNNING" = "running" ]; then
-            # Retrieve DB user and SSH key from Coolify database
-            DB_USER=$(docker inspect coolify-db --format '{{ .Config.Env }}' | grep -oP 'POSTGRES_USER=\K[^ ]+')
-            DB_SSH_KEY=$(docker exec coolify-db psql -U $DB_USER -d coolify -t -c "SELECT \"private_key\" FROM \"private_keys\" WHERE id = 0 AND team_id = 0 LIMIT 1;" -A -t)
-
-            if [ -z "$DB_SSH_KEY" ]; then
-                # If no key found in DB, generate a new one
-                echo " - SSH key not found in database. Generating new key."
-                generateSshKey
-            else
-                # If key found in DB, save it and update authorized_keys
-                echo " - SSH key found in database. Saving to file."
-                echo "$DB_SSH_KEY" > /data/coolify/ssh/keys/id.root@host.docker.internal
-                chmod 600 /data/coolify/ssh/keys/id.root@host.docker.internal
-                chown 9999 /data/coolify/ssh/keys/id.root@host.docker.internal
-
-                # Generate public key from private key and update authorized_keys
-                ssh-keygen -y -f /data/coolify/ssh/keys/id.root@host.docker.internal -C root@coolify > /data/coolify/ssh/keys/id.root@host.docker.internal.pub
-                sed -i "/root@coolify/d" ~/.ssh/authorized_keys
-                cat /data/coolify/ssh/keys/id.root@host.docker.internal.pub >> ~/.ssh/authorized_keys
-                rm -f /data/coolify/ssh/keys/id.root@host.docker.internal.pub
-                chmod 600 ~/.ssh/authorized_keys
-            fi
-        fi
-    # If SSH key doesn't exist in either location
-    elif ! checkSshKeyInAuthorizedKeys && ! checkSshKeyInCoolifyData; then
-        # Ensure Coolify DB is running before proceeding
-        if [ "$DB_RUNNING" = "running" ]; then
-            # Retrieve DB user and SSH key from Coolify database
-            DB_USER=$(docker inspect coolify-db --format '{{ .Config.Env }}' | grep -oP 'POSTGRES_USER=\K[^ ]+')
-            DB_SSH_KEY=$(docker exec coolify-db psql -U $DB_USER -d coolify -t -c "SELECT \"private_key\" FROM \"private_keys\" WHERE id = 0 AND team_id = 0 LIMIT 1;" -A -t)
-            if [ -z "$DB_SSH_KEY" ]; then
-                # If no key found in DB, generate a new one
-                echo " - SSH key not found in database. Generating new key."
-                generateSshKey
-            else
-                # If key found in DB, save it and update authorized_keys
-                echo " - SSH key found in database. Saving to file."
-                echo "$DB_SSH_KEY" > /data/coolify/ssh/keys/id.root@host.docker.internal
-                chmod 600 /data/coolify/ssh/keys/id.root@host.docker.internal
-                ssh-keygen -y -f /data/coolify/ssh/keys/id.root@host.docker.internal -C root@coolify > /data/coolify/ssh/keys/id.root@host.docker.internal.pub
-                sed -i "/root@coolify/d" ~/.ssh/authorized_keys
-                cat /data/coolify/ssh/keys/id.root@host.docker.internal.pub >> ~/.ssh/authorized_keys
-            fi
-        else
-         generateSshKey
-        fi
-    fi
-}
-
-syncSshKeys || true
+    ssh-keygen -t ed25519 -a 100 -f /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal -q -N "" -C coolify
+    chown 9999 /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal
+    sed -i "/coolify/d" ~/.ssh/authorized_keys
+    cat /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal.pub >> ~/.ssh/authorized_keys
+    rm -f /data/coolify/ssh/keys/id.$CURRENT_USER@host.docker.internal.pub
+fi
 
 chown -R 9999:root /data/coolify
 chmod -R 700 /data/coolify
@@ -492,7 +424,7 @@ echo -e " - It could take a while based on your server's performance, network sp
 echo -e " - Please wait."
 getAJoke
 
-bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}" >/dev/null 2>&1
+bash /data/coolify/source/upgrade.sh "${LATEST_VERSION:-latest}" "${LATEST_HELPER_VERSION:-latest}"
 echo " - Coolify installed successfully."
 rm -f $ENV_FILE-$DATE
 

templates/compose/postiz.yaml

@@ -3,21 +3,30 @@
 # slogan:
 # tags:
 # logo:
-# port: 5000
+# port: 4200
 
 services:
   postiz:
     image: "ghcr.io/gitroomhq/postiz-app:latest"
     environment:
-      - SERVICE_FQDN_POSTIZ_5000
+      - SERVICE_FQDN_POSTIZ_4200
       - MAIN_URL=${SERVICE_FQDN_POSTIZ}
       - FRONTEND_URL=${SERVICE_FQDN_POSTIZ}
-      - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZ_3000}
+      - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZAPI_3000}
       - JWT_SECRET=${SERVICE_REALBASE64_JWTSECRET}
       - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-postiz}?schema=public
       - REDIS_URL=redis://redis:6379
-      - BACKEND_INTERNAL_URL=${SERVICE_FQDN_POSTIZ}
+      - BACKEND_INTERNAL_URL=http://localhost:3000/
       - IS_GENERAL=true
+      - CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
+      - CLOUDFLARE_ACCESS_KEY=${CLOUDFLARE_ACCESS_KEY}
+      - CLOUDFLARE_SECRET_ACCESS_KEY=${CLOUDFLARE_SECRET_ACCESS_KEY}
+      - CLOUDFLARE_BUCKETNAME=${CLOUDFLARE_BUCKETNAME}
+      - CLOUDFLARE_BUCKET_URL=${CLOUDFLARE_BUCKET_URL}
+      - CLOUDFLARE_REGION=${CLOUDFLARE_REGION}
+      - RESEND_API_KEY=${RESEND_API_KEY}
+      - EMAIL_FROM_ADDRESS=${EMAIL_FROM_ADDRESS}
+      - EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
     depends_on:
       postgres:
         condition: service_healthy

versions.json

@@ -1,10 +1,10 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.343"
+            "version": "4.0.0-beta.345"
         },
         "nightly": {
-            "version": "4.0.0-beta.344"
+            "version": "4.0.0-beta.346"
         },
         "helper": {
             "version": "1.0.1"