Merge pull request coollabsio#2853 from coollabsio/next

v4.0.0-beta.315

Author: andrasbacsai

app/Actions/Service/StartService.php

@@ -20,7 +20,7 @@ public function handle(Service $service)
         $commands[] = "docker network inspect $service->uuid >/dev/null 2>&1 || docker network create --attachable $service->uuid";
         $commands[] = 'echo Starting service.';
         $commands[] = "echo 'Pulling images.'";
-        $commands[] = 'docker compose pull --policy always';
+        $commands[] = 'docker compose pull';
         $commands[] = "echo 'Starting containers.'";
         $commands[] = 'docker compose up -d --remove-orphans --force-recreate --build';
         $commands[] = "docker network connect $service->uuid coolify-proxy >/dev/null 2>&1 || true";

app/Actions/Shared/PullImage.php

@@ -15,7 +15,7 @@ public function handle(Service $resource)
 
         $commands[] = 'cd '.$resource->workdir();
         $commands[] = "echo 'Saved configuration files to {$resource->workdir()}.'";
-        $commands[] = 'docker compose pull --policy always';
+        $commands[] = 'docker compose pull';
 
         $server = data_get($resource, 'server');
 

app/Livewire/Tags/Index.php

@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Tags;
 
-use App\Http\Controllers\Api\Deploy;
+use App\Http\Controllers\Api\DeployController;
 use App\Models\Tag;
 use Illuminate\Support\Collection;
 use Livewire\Attributes\Url;
@@ -51,11 +51,11 @@ public function redeploy_all()
     {
         try {
             $this->applications->each(function ($resource) {
-                $deploy = new Deploy();
+                $deploy = new DeployController();
                 $deploy->deploy_resource($resource);
             });
             $this->services->each(function ($resource) {
-                $deploy = new Deploy();
+                $deploy = new DeployController();
                 $deploy->deploy_resource($resource);
             });
             $this->dispatch('success', 'Mass deployment started.');

app/Livewire/Tags/Show.php

@@ -2,7 +2,7 @@
 
 namespace App\Livewire\Tags;
 
-use App\Http\Controllers\Api\Deploy;
+use App\Http\Controllers\Api\DeployController;
 use App\Models\ApplicationDeploymentQueue;
 use App\Models\Tag;
 use Livewire\Component;
@@ -59,11 +59,11 @@ public function redeploy_all()
         try {
             $message = collect([]);
             $this->applications->each(function ($resource) use ($message) {
-                $deploy = new Deploy();
+                $deploy = new DeployController();
                 $message->push($deploy->deploy_resource($resource));
             });
             $this->services->each(function ($resource) use ($message) {
-                $deploy = new Deploy();
+                $deploy = new DeployController();
                 $message->push($deploy->deploy_resource($resource));
             });
             $this->dispatch('success', 'Mass deployment started.');

bootstrap/helpers/shared.php

@@ -1688,19 +1688,14 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             $read_only = data_get($volume, 'read_only');
                             if ($source && $target) {
                                 $uuid = $resource->uuid;
-                                if ((str($source)->startsWith('.') || str($source)->startsWith('~'))) {
+                                if ((str($source)->startsWith('.') || str($source)->startsWith('~') || str($source)->startsWith('/'))) {
                                     $dir = base_configuration_dir().'/applications/'.$resource->uuid;
                                     if (str($source, '.')) {
                                         $source = str($source)->replaceFirst('.', $dir);
                                     }
                                     if (str($source, '~')) {
                                         $source = str($source)->replaceFirst('~', $dir);
                                     }
-                                    if ($pull_request_id === 0) {
-                                        $source = $uuid."-$source";
-                                    } else {
-                                        $source = $uuid."-$source-pr-$pull_request_id";
-                                    }
                                     if ($read_only) {
                                         data_set($volume, 'source', $source.':'.$target.':ro');
                                     } else {

config/sentry.php

@@ -7,7 +7,7 @@
 
     // 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.314',
+    'release' => '4.0.0-beta.315',
     // 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.314';
+return '4.0.0-beta.315';

versions.json

@@ -1,7 +1,7 @@
 {
     "coolify": {
         "v4": {
-            "version": "4.0.0-beta.314"
+            "version": "4.0.0-beta.315"
         }
     }
-}
+}