From 1f021cdd95a5c0b3224b2b9fc67a9ce011e437d0 Mon Sep 17 00:00:00 2001
From: RedLeaderOne <luc.coupal.1@ulaval.ca>
Date: Mon, 11 Dec 2023 07:01:07 -0500
Subject: [PATCH] fix: build system path passed through a environment variable

---
 build_system/docker-compose.dependencies.yaml    | 4 ++--
 build_system/docker-compose.libpointmatcher.yaml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build_system/docker-compose.dependencies.yaml b/build_system/docker-compose.dependencies.yaml
index c88e8389..cc364c67 100644
--- a/build_system/docker-compose.dependencies.yaml
+++ b/build_system/docker-compose.dependencies.yaml
@@ -6,7 +6,7 @@ services:
     build:
       target: libpointmatcher-dependencies-general
       context: ..
-      dockerfile: ./build_system/ubuntu/Dockerfile.dependencies
+      dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.dependencies
       platforms:
         - "linux/amd64"
         - "linux/arm64/v8"
@@ -33,7 +33,7 @@ services:
     image: ${NBS_DOCKERHUB_NAMESPACE:?err}/libpointmatcher-dependencies-doc:${NBS_IMAGE_TAG:?err}
     build:
       context: ..
-      dockerfile: ./build_system/ubuntu/Dockerfile.dependencies.doxygen
+      dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.dependencies.doxygen
       platforms:
         - "linux/amd64"
         - "linux/arm64/v8"
diff --git a/build_system/docker-compose.libpointmatcher.yaml b/build_system/docker-compose.libpointmatcher.yaml
index 4db35b1a..487192f2 100644
--- a/build_system/docker-compose.libpointmatcher.yaml
+++ b/build_system/docker-compose.libpointmatcher.yaml
@@ -10,7 +10,7 @@ services:
     pull_policy: build
     build:
       context: ..
-      dockerfile: ubuntu/Dockerfile.libpointmatcher.compilation_test
+      dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR:?err}/ubuntu/Dockerfile.libpointmatcher.compilation_test
       target: test-compilation-auto-path-resolution
       ## Mute 'platforms' while using arch virtualization with C++ build to prevent segmentation fault during lpm cmake install
 #      platforms:
@@ -48,7 +48,7 @@ services:
     pull_policy: build
     build:
       context: ..
-      dockerfile: ubuntu/Dockerfile.libpointmatcher.ci_PR
+      dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.ci_PR
       no_cache: true
       args:
         PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
@@ -80,7 +80,7 @@ services:
     pull_policy: build
     build:
       context: ..
-      dockerfile: ubuntu/Dockerfile.libpointmatcher.ci_SITREP_matrix
+      dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.ci_SITREP_matrix
       no_cache: true
       args:
         PROJECT_HUB: ${NBS_DOCKERHUB_NAMESPACE}
@@ -106,7 +106,7 @@ services:
     container_name: libpointmatcher
     build:
       context: ..
-      dockerfile: ubuntu/Dockerfile.libpointmatcher.hub_release
+      dockerfile: ${NBS_SUPERPROJECT_BUILD_SYSTEM_DIR}/ubuntu/Dockerfile.libpointmatcher.hub_release
       platforms:
         - "linux/amd64"
         - "linux/arm64/v8"