From 19cfe4e51455d1097ca56824ab14968fe79cf4a3 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 17 Jul 2024 08:09:33 +0200 Subject: [PATCH] fix: new docker compose parsing --- bootstrap/helpers/shared.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php index 4480c65f4..e3c8d5218 100644 --- a/bootstrap/helpers/shared.php +++ b/bootstrap/helpers/shared.php @@ -1688,7 +1688,7 @@ 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); @@ -1696,11 +1696,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal 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 {