From b08c842ef460a6ba2cf1edea34e27a93c48fb3d7 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 11 Jun 2020 20:20:57 +0200
Subject: Work around for permissions problems when different users share a
 ccache.

---
 cdist              | 2 +-
 make-ccache-volume | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cdist b/cdist
index 84814ac..01e016c 100755
--- a/cdist
+++ b/cdist
@@ -554,7 +554,7 @@ class DockerTarget(Target):
         if self.privileged:
             opts += '--privileged=true '
         if self.ccache:
-            opts += "-e CCACHE_DIR=/ccache/%s --mount source=ccache,target=/ccache" % self.image
+            opts += "-e CCACHE_DIR=/ccache/%s-%d --mount source=ccache,target=/ccache" % (self.image, os.getuid())
 
         tag = self.image
         if config.has('docker_hub_repository'):
diff --git a/make-ccache-volume b/make-ccache-volume
index 60a2e42..aa284d2 100755
--- a/make-ccache-volume
+++ b/make-ccache-volume
@@ -2,8 +2,10 @@
 
 docker volume create ccache
 id=$(docker run --mount source=ccache,target=/ccache -itd ubuntu-18.04-64 bash)
-for t in ubuntu-18.04-64 windows windows_2.15.x; do
-  docker exec $id mkdir /ccache/$t
-  docker exec $id chown carl /ccache/$t
+for u in 127 1000; do
+  for t in ubuntu-18.04-64 windows windows_2.15.x; do
+    docker exec $id mkdir /ccache/$t-$u
+    docker exec $id chmod 777 /ccache/$t-$u
+  done
 done
 docker kill $id
-- 
cgit v1.2.3