From 0f89417baf7ef319a10218db67fcc296ca20f939 Mon Sep 17 00:00:00 2001 From: Fred Oh Date: Fri, 28 Apr 2023 08:01:07 -0700 Subject: [PATCH] scripts/docker-run.sh: run with sudo-cwd.sh There is a UID mistmatch and file permission problem. sudo-cwd.sh will switch id every docker run command. 80e9c3454a0a048704f863a52443b536a27a2410 was reverted due to missing a toolchain. Signed-off-by: Fred Oh (cherry picked from commit 745d4ccd8bbf5509fd3af6218f663441d5b18862) --- scripts/docker-run.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/docker-run.sh b/scripts/docker-run.sh index 21e2919db194..4b3d64fe1c12 100755 --- a/scripts/docker-run.sh +++ b/scripts/docker-run.sh @@ -33,6 +33,8 @@ test "$(id -u)" = 1000 || >&2 printf "Warning: this script should be run as user ID 1000 to match the container's account\n" set -x +# FIXME: During the transition to sudo-cwd.sh, the tag will be "latest_ubuntu22.04". +# Later it will be back to latest docker run -i -v "${SOF_TOP}":/home/sof/work/sof.git \ -v "${SOF_TOP}":/home/sof/work/sof-bind-mount-DO-NOT-DELETE \ --env CMAKE_BUILD_TYPE \ @@ -42,6 +44,5 @@ docker run -i -v "${SOF_TOP}":/home/sof/work/sof.git \ --env VERBOSE \ --env http_proxy="$http_proxy" \ --env https_proxy="$https_proxy" \ - --user "$(id -u)" \ $SOF_DOCKER_RUN \ - thesofproject/sof "$@" + thesofproject/sof:latest_ubuntu22.04 ./scripts/sudo-cwd.sh "$@"