Merge pull request #762 from Karl-Han/docker

Make CVW_MOUNT more usable.
This commit is contained in:
Rose Thompson 2024-05-01 08:54:50 -05:00 committed by GitHub
commit 07b169688b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -3,7 +3,10 @@ if [ -n "$USE_PODMAN" ]; then
else else
DOCKER_EXEC=$(which docker) DOCKER_EXEC=$(which docker)
fi fi
CVW_MOUNT=${CVW_MOUNT:$(pwd)/../../} if [ -n "$USE_PODMAN" ]; then
CVW_MOUNT=$(pwd)/../../
fi
echo ${CVW_MOUNT}
USERNAME="cad" USERNAME="cad"
UBUNTU_WALLY_HASH=$(${DOCKER_EXEC} images --quiet wallysoc/ubuntu_wally) UBUNTU_WALLY_HASH=$(${DOCKER_EXEC} images --quiet wallysoc/ubuntu_wally)
@ -28,7 +31,7 @@ elif [ -z $TOOLCHAINS_HASH ]; then
exit 1 exit 1
else else
echo "Get ${TOOLCHAINS_HASH} for toolchains_wally" echo "Get ${TOOLCHAINS_HASH} for toolchains_wally"
${DOCKER_EXEC} run -it --rm -v ${CVW_MOUNT}:/home/${USERNAME}/cvw wallysoc/toolchains_wally ${DOCKER_EXEC} run --user root -it --rm -v ${CVW_MOUNT}:/home/${USERNAME}/cvw wallysoc/toolchains_wally
fi fi
echo "Successfully reach the end" echo "Successfully reach the end"