]> git.ipfire.org Git - thirdparty/ccache.git/commitdiff
chore: Make it possible to run misc/build-in-docker from any directory
authorJoel Rosdahl <joel@rosdahl.net>
Sun, 17 Mar 2024 14:56:47 +0000 (15:56 +0100)
committerJoel Rosdahl <joel@rosdahl.net>
Sun, 24 Mar 2024 08:32:13 +0000 (09:32 +0100)
misc/build-in-docker
misc/test-all-systems

index bf37bd0214e94d3c62ffe3e9dc903020c6ffe27b..a6227bc894831562f56acb620c22113d5e0703c0 100755 (executable)
@@ -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:-}" \
index 1383f958afd3cb4ef5f30f452c66c594ead639d9..85812a4f16d18cbe9a393041e1a4c22385d450de 100755 (executable)
@@ -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