Skip to content

Commit 9f7d312

Browse files
committed
build: relocate tool installation and artifact paths to /tmp
Update Dockerfiles, build tasks, and test scripts to use /tmp for tool storage and execution to ensure compatibility with restricted environments.
1 parent dbc34f6 commit 9f7d312

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

build/artifacts/Tasks/ArtifactsDotnetToolTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public override void Run(BuildContext context)
2222
{
2323
if (context.Version == null)
2424
return;
25-
var rootPrefix = string.Empty;
25+
var rootPrefix = "/tmp";
2626
var version = context.Version.NugetVersion;
2727

2828
foreach (var dockerImage in context.Images)

build/artifacts/Tasks/ArtifactsMsBuildCoreTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public override void Run(BuildContext context)
2121
{
2222
if (context.Version == null)
2323
return;
24-
var rootPrefix = string.Empty;
24+
var rootPrefix = "/tmp";
2525
var version = context.Version.NugetVersion;
2626

2727
foreach (var dockerImage in context.Images)

build/artifacts/Tasks/ArtifactsNativeTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
2323
if (context.Version?.SemVersion == null)
2424
return;
2525
var version = context.Version.SemVersion.ToLower();
26-
var rootPrefix = string.Empty;
26+
var rootPrefix = "/tmp";
2727

2828
foreach (var dockerImage in context.Images)
2929
{

build/common/Utilities/DockerContextExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private IEnumerable<string> GetDockerTags(DockerImage dockerImage,
218218
private DockerContainerRunSettings GetDockerRunSettings(Architecture arch)
219219
{
220220
var currentDir = context.MakeAbsolute(context.Directory("."));
221-
var root = string.Empty;
221+
var root = "/tmp";
222222
var settings = new DockerContainerRunSettings
223223
{
224224
Rm = true,

build/docker/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ ARG VERSION
99

1010
WORKDIR /nuget
1111
COPY $nugetFolder/ ./
12-
RUN dotnet tool install GitVersion.Tool --version $VERSION --tool-path /tools --add-source .
12+
RUN dotnet tool install GitVersion.Tool --version $VERSION --tool-path /tmp/tools --add-source .
1313

1414
FROM $REGISTRY/gittools/build-images:$DISTRO-runtime-$DOTNET_VERSION
1515

16-
WORKDIR /tools
17-
COPY --from=installer /tools .
16+
WORKDIR /tmp/tools
17+
COPY --from=installer /tmp/tools .
1818
RUN git config --global --add safe.directory '*'
1919

20-
ENTRYPOINT ["/tools/dotnet-gitversion"]
20+
ENTRYPOINT ["/tmp/tools/dotnet-gitversion"]

tests/scripts/test-global-tool.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ do
1717
done
1818

1919
git config --global --add safe.directory '*'
20-
result=$(dotnet tool install GitVersion.Tool --version $version --tool-path /tools --add-source $nugetPath) # >/dev/null
20+
result=$(dotnet tool install GitVersion.Tool --version $version --tool-path /tmp/tools --add-source $nugetPath) # >/dev/null
2121
status=$?
2222
if test $status -eq 0
2323
then
24-
/tools/dotnet-gitversion $repoPath /showvariable FullSemver /nocache
24+
/tmp/tools/dotnet-gitversion $repoPath /showvariable FullSemver /nocache
2525
else
2626
echo $result
2727
fi

tests/scripts/test-native-tool.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ do
1717
done
1818

1919
git config --global --add safe.directory '*'
20-
result=$(tar -xvpf /native/gitversion-$runtime-$version.tar.gz -C /native) # >/dev/null
20+
result=$(tar -xvpf /tmp/native/gitversion-$runtime-$version.tar.gz -C /tmp/native) # >/dev/null
2121
status=$?
2222
if test $status -eq 0
2323
then
24-
/native/gitversion $repoPath /showvariable FullSemver /nocache
24+
/tmp/native/gitversion $repoPath /showvariable FullSemver /nocache
2525
else
2626
echo $result
2727
fi

0 commit comments

Comments
 (0)