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.

This can be done like this,
./scripts/docker-run.sh ./scripts/sudo-cwd.sh CMD

But not to make build script, just include sudo-cwd.sh in docker-run.sh.

Signed-off-by: Fred Oh <fred.oh@linux.intel.com>
This commit is contained in:
Fred Oh 2023-04-13 12:17:16 -07:00 committed by Liam Girdwood
parent 05f92cb371
commit 80e9c3454a
1 changed files with 3 additions and 2 deletions

View File

@ -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 "$@"