From dff7ed5b7bcd87ed185aa9274306a40376339c5b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 6 Dec 2023 13:45:43 +0100
Subject: [PATCH] fix: bind volumes for compose bp

---
 bootstrap/helpers/shared.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 8e63cfe3b..3b4e2708d 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -1124,7 +1124,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     $serviceVolumes = $serviceVolumes->map(function ($volume) use ($resource, $pull_request_id, $topLevelVolumes) {
                         if (is_string($volume)) {
                             $volume = str($volume);
-                            if ($volume->contains(':')) {
+                            if ($volume->contains(':') && !$volume->startsWith('/')) {
                                 $name = $volume->before(':');
                                 $mount = $volume->after(':');
                                 $newName = $resource->uuid . "-{$name}-pr-$pull_request_id";
@@ -1138,13 +1138,13 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                             if ($source) {
                                 $newSource = $resource->uuid . "-{$source}-pr-$pull_request_id";
                                 data_set($volume, 'source', $newSource);
-                                $topLevelVolumes->put($newSource, [
-                                    'name' => $newSource,
-                                ]);
+                                if (!str($source)->startsWith('/')) {
+                                    $topLevelVolumes->put($newSource, [
+                                        'name' => $newSource,
+                                    ]);
+                                }
                             }
                         }
-
-
                         return $volume->value();
                     });
                     data_set($service, 'volumes', $serviceVolumes->toArray());
@@ -1154,7 +1154,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                     $serviceVolumes = $serviceVolumes->map(function ($volume) use ($resource, $topLevelVolumes) {
                         if (is_string($volume)) {
                             $volume = str($volume);
-                            if ($volume->contains(':')) {
+                            if ($volume->contains(':') && !$volume->startsWith('/')) {
                                 $name = $volume->before(':');
                                 $mount = $volume->after(':');
                                 if ($name->startsWith('.') || $name->startsWith('~')) {
@@ -1175,7 +1175,7 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
                         } else if (is_array($volume)) {
                             $source = data_get($volume, 'source');
                             if ($source) {
-                                if (str($source, '.') || str($source, '~')) {
+                                if ((str($source)->startsWith('.') || str($source)->startsWith('~')) && !str($source)->startsWith('/')) {
                                     $dir = base_configuration_dir() . '/applications/' . $resource->uuid;
                                     if (str($source, '.')) {
                                         $source = str('.', $dir, $source);