fix: try with --user mapping

WebAssembly · Mar 15, 2024 · 91c48f0 · 91c48f0
1 parent f3be54d
commit 91c48f0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/Makefile b/Makefile
@@ -269,7 +269,6 @@ package: build/package.BUILT
 
 build/package.BUILT: build strip
 	mkdir -p dist
-	./docker_ensure_git_access.sh
 	./deb_from_installation.sh $(shell pwd)/dist "$(VERSION)" "$(BUILD_PREFIX)"
 	./tar_from_installation.sh "$(shell pwd)/dist" "$(VERSION)" "$(BUILD_PREFIX)"
 	touch build/package.BUILT

diff --git a/docker_build.sh b/docker_build.sh
@@ -6,4 +6,4 @@ docker build -t wasi-sdk-builder:latest .
 
 echo "Building the package in docker image"
 mkdir -p ~/.ccache
-docker run --rm -v "$PWD":/workspace -v ~/.ccache:/root/.ccache -e NINJA_FLAGS=-v --workdir /workspace --tmpfs /tmp:exec wasi-sdk-builder:latest make package LLVM_CMAKE_FLAGS=-DLLVM_CCACHE_BUILD=ON
+docker run --rm --user $(id -u):$(id -g) -v "$PWD":/workspace:Z -v ~/.ccache:/root/.ccache:Z -e NINJA_FLAGS=-v --workdir /workspace --tmpfs /tmp:exec wasi-sdk-builder:latest make package LLVM_CMAKE_FLAGS=-DLLVM_CCACHE_BUILD=ON
diff --git a/docker_ensure_git_access.sh b/docker_ensure_git_access.sh