Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Renovate Bot
renovate
Commits
7b1c1170
Unverified
Commit
7b1c1170
authored
2 years ago
by
Rhys Arkins
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
fix: log containerbaseDir (#17509)
parent
9b1115a7
Branches
Branches containing commit
Tags
37.437.1
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/util/exec/docker/index.ts
+9
-2
9 additions, 2 deletions
lib/util/exec/docker/index.ts
lib/util/exec/index.ts
+1
-0
1 addition, 0 deletions
lib/util/exec/index.ts
with
10 additions
and
2 deletions
lib/util/exec/docker/index.ts
+
9
−
2
View file @
7b1c1170
...
@@ -232,8 +232,15 @@ export async function generateDockerCommand(
...
@@ -232,8 +232,15 @@ export async function generateDockerCommand(
}
}
const
volumeDirs
:
VolumeOption
[]
=
[
localDir
,
cacheDir
];
const
volumeDirs
:
VolumeOption
[]
=
[
localDir
,
cacheDir
];
if
(
containerbaseDir
&&
cacheDir
&&
!
containerbaseDir
.
startsWith
(
cacheDir
))
{
if
(
containerbaseDir
)
{
volumeDirs
.
push
(
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
);
volumeDirs
.
push
(...
volumes
);
result
.
push
(...
prepareVolumes
(
volumeDirs
));
result
.
push
(...
prepareVolumes
(
volumeDirs
));
...
...
This diff is collapsed.
Click to expand it.
lib/util/exec/index.ts
+
1
−
0
View file @
7b1c1170
...
@@ -105,6 +105,7 @@ async function prepareRawExec(
...
@@ -105,6 +105,7 @@ async function prepareRawExec(
GlobalConfig
.
get
();
GlobalConfig
.
get
();
if
(
binarySource
===
'
docker
'
||
binarySource
===
'
install
'
)
{
if
(
binarySource
===
'
docker
'
||
binarySource
===
'
install
'
)
{
logger
.
debug
(
`Setting BUILDPACK_CACHE_DIR to
${
containerbaseDir
!
}
`
);
opts
.
env
??=
{};
opts
.
env
??=
{};
opts
.
env
.
BUILDPACK_CACHE_DIR
=
containerbaseDir
;
opts
.
env
.
BUILDPACK_CACHE_DIR
=
containerbaseDir
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment