From: Joel Rosdahl <joel@rosdahl.net>
Date: Sun, 17 Mar 2024 14:56:47 +0000 (+0100)
Subject: chore: Make it possible to run misc/build-in-docker from any directory
X-Git-Tag: v4.10~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57d3650a49945227facfc25ab8696901505d81e4;p=thirdparty%2Fccache.git

chore: Make it possible to run misc/build-in-docker from any directory
---

diff --git a/misc/build-in-docker b/misc/build-in-docker
index bf37bd02..a6227bc8 100755
--- a/misc/build-in-docker
+++ b/misc/build-in-docker
@@ -21,22 +21,23 @@ fi
 name=${1}
 shift
 
+top_dir="$(dirname "$(realpath "$0")")/.."
 tag="ccache-build:$name"
 command="${COMMAND:-/source/ci/build}"
 interactive="${INTERACTIVE:+--interactive --tty}"
 
 # Build (if not exists):
-docker build -t "$tag" "dockerfiles/$name"
+docker build -t "$tag" "${top_dir}/dockerfiles/$name"
 
 # Cache compilation across docker sessions
-mkdir -p build-in-docker
-mkdir -p build-in-docker/docker-ccache
+mkdir -p "${top_dir}/build-in-docker"
+mkdir -p "${top_dir}/build-in-docker/docker-ccache"
 
 docker run \
     --init \
     --rm \
-    --volume "$PWD:/source" \
-    --volume "$PWD/build-in-docker/docker-ccache:/ccache" \
+    --volume "${top_dir}:/source" \
+    --volume "${top_dir}/build-in-docker/docker-ccache:/ccache" \
     --tmpfs /builddir:rw,exec \
     --workdir /builddir \
     --env ASAN_OPTIONS="${ASAN_OPTIONS:-}" \
diff --git a/misc/test-all-systems b/misc/test-all-systems
index 1383f958..85812a4f 100755
--- a/misc/test-all-systems
+++ b/misc/test-all-systems
@@ -6,7 +6,8 @@
 
 set -eu
 
-build_in_docker=$(dirname $0)/build-in-docker
+top_dir="$(dirname "$(realpath "$0")")/.."
+build_in_docker="${top_dir}/build-in-docker"
 
 build() {
     local name=$1