From 54359015f0255856a16c5792123ed5a3584bfa66 Mon Sep 17 00:00:00 2001
From: Lucas Pimentel <lucas.pimentel@datadoghq.com>
Date: Thu, 13 Jun 2024 17:18:13 -0400
Subject: [PATCH] [builds] fix `build_in_docker` scripts (#5688)

* ignore bin/obj folders in docker

* fix powershell syntax error

* stop the ps1 script on errors

* no need to change directory

* oops
---
 tracer/build/_build/.dockerignore | 3 +++
 tracer/build_in_docker.ps1        | 5 ++---
 tracer/build_in_docker.sh         | 6 ++----
 3 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 tracer/build/_build/.dockerignore

diff --git a/tracer/build/_build/.dockerignore b/tracer/build/_build/.dockerignore
new file mode 100644
index 000000000000..a362d0199f10
--- /dev/null
+++ b/tracer/build/_build/.dockerignore
@@ -0,0 +1,3 @@
+**/bin/
+**/obj/
+**/*.user
\ No newline at end of file
diff --git a/tracer/build_in_docker.ps1 b/tracer/build_in_docker.ps1
index f10f3ff33c28..976ebba2c44d 100644
--- a/tracer/build_in_docker.ps1
+++ b/tracer/build_in_docker.ps1
@@ -4,8 +4,7 @@ Param(
     [string[]]$BuildArguments
 )
 
-# in case we are being run from outside this directory
-Set-Location $PSScriptRoot
+$ErrorActionPreference = "Stop"
 
 $ROOT_DIR="$PSScriptRoot/.."
 $BUILD_DIR="$ROOT_DIR/tracer/build/_build"
@@ -18,7 +17,7 @@ $IMAGE_NAME="dd-trace-dotnet/alpine-base"
    "$BUILD_DIR"
 
 &docker run -it --rm `
-    --mount type=bind,source="$ROOT_DIR",target=/project `
+    --mount "type=bind,source=$ROOT_DIR,target=/project" `
     --env NugetPackageDirectory=/project/packages `
     --env artifacts=/project/tracer/bin/artifacts `
     --env DD_INSTRUMENTATION_TELEMETRY_ENABLED=0 `
diff --git a/tracer/build_in_docker.sh b/tracer/build_in_docker.sh
index f31a772793ce..0198b7b1be71 100755
--- a/tracer/build_in_docker.sh
+++ b/tracer/build_in_docker.sh
@@ -1,10 +1,8 @@
 #!/usr/bin/env bash
 set -euox pipefail
 
-# in case we are being run from outside this directory
-cd "$(dirname "$0")"
-
-ROOT_DIR="$(dirname $(pwd))"
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+ROOT_DIR="$(dirname -- "$SCRIPT_DIR" )"
 BUILD_DIR="$ROOT_DIR/tracer/build/_build"
 IMAGE_NAME="dd-trace-dotnet/alpine-base"