Fix dockerfile path with compose cli v2 (#618)

inviqa · Sep 2, 2021 · 24a8ec1 · 24a8ec1
1 parent 60eb2c6
commit 24a8ec1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/_base/harness/config/functions.yml b/src/_base/harness/config/functions.yml
@@ -123,10 +123,12 @@ function('docker_service_images', [filterService]): |
     }
 
     if (isset($service['build'])) {
-      $context = rtrim($service['build']['context'], '/');
-      $dockerfile = $service['build']['dockerfile'] ?? 'Dockerfile';
+      $dockerfilePath = $service['build']['dockerfile'] ?? 'Dockerfile';
+      if (substr($dockerfilePath, 0, 1) !== '/') {
+        $dockerfilePath = rtrim($service['build']['context'], '/') . '/' . $dockerfilePath;
+      }
 
-      if (preg_match_all('/^FROM\s+([^\s]*)/m', file_get_contents($context.'/'.$dockerfile), $matches) === false) {
+      if (preg_match_all('/^FROM\s+([^\s]*)/m', file_get_contents($dockerfilePath), $matches) === false) {
         continue;
       }