From 7b1c1170a78d31118d93e4a0197d22c907320fef Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 30 Aug 2022 15:21:12 +0300
Subject: [PATCH] fix: log containerbaseDir (#17509)
---
lib/util/exec/docker/index.ts | 11 +++++++++--
lib/util/exec/index.ts | 1 +
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lib/util/exec/docker/index.ts b/lib/util/exec/docker/index.ts
index 3ea7cbfc63..c6eefe1591 100644
--- a/lib/util/exec/docker/index.ts
+++ b/lib/util/exec/docker/index.ts
@@ -232,8 +232,15 @@ export async function generateDockerCommand(
}
const volumeDirs: VolumeOption[] = [localDir, cacheDir];
- if (containerbaseDir && cacheDir && !containerbaseDir.startsWith(cacheDir)) {
- volumeDirs.push(containerbaseDir);
+ if (containerbaseDir) {
+ if (cacheDir && containerbaseDir.startsWith(cacheDir)) {
+ logger.debug('containerbaseDir is inside cacheDir');
+ } else {
+ logger.debug('containerbaseDir is separate from cacheDir');
+ volumeDirs.push(containerbaseDir);
+ }
+ } else {
+ logger.debug('containerbaseDir is missing');
}
volumeDirs.push(...volumes);
result.push(...prepareVolumes(volumeDirs));
diff --git a/lib/util/exec/index.ts b/lib/util/exec/index.ts
index 9887a3d4f2..8e9adfc058 100644
--- a/lib/util/exec/index.ts
+++ b/lib/util/exec/index.ts
@@ -105,6 +105,7 @@ async function prepareRawExec(
GlobalConfig.get();
if (binarySource === 'docker' || binarySource === 'install') {
+ logger.debug(`Setting BUILDPACK_CACHE_DIR to ${containerbaseDir!}`);
opts.env ??= {};
opts.env.BUILDPACK_CACHE_DIR = containerbaseDir;
}
--
GitLab