dsg/cloud-hypervisor
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dev_cli: Enable pulling latest dev container on Arm

Browse source 
Currently the latest cloudhypervisor/dev docker container is the
multi-arch image. We can pull the arm image directly.

Signed-off-by: Henry Wang <Henry.Wang@arm.com>
This commit is contained in:
Henry Wang 2021-08-26 07:40:52 -04:00 • committed by Rob Bradford
parent 001ee6794c
commit e1f35628e2
1 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

20
scripts/dev_cli.sh
View file

@ -239,9 +239,7 @@ cmd_build() {
done
ensure_build_dir
if [ $(uname -m) = "x86_64" ]; then
ensure_latest_ctr
fi
ensure_latest_ctr
process_volumes_args
if [[ "$hypervisor" != "kvm" ]]; then
@ -280,9 +278,7 @@ cmd_clean() {
cargo_args=("$@")
ensure_build_dir
if [ $(uname -m) = "x86_64" ]; then
ensure_latest_ctr
fi
ensure_latest_ctr
$DOCKER_RUNTIME run \
--user "$(id -u):$(id -g)" \
@ -346,9 +342,7 @@ cmd_tests() {
set -- "$@" '--hypervisor' $hypervisor
ensure_build_dir
if [ $(uname -m) = "x86_64" ]; then
ensure_latest_ctr
fi
ensure_latest_ctr
process_volumes_args
target="$(uname -m)-unknown-linux-${libc}"
@ -479,9 +473,7 @@ cmd_build-container() {
done
ensure_build_dir
if [ $(uname -m) = "x86_64" ]; then
ensure_latest_ctr
fi
ensure_latest_ctr
BUILD_DIR=/tmp/cloud-hypervisor/container/
@ -514,9 +506,7 @@ cmd_shell() {
shift
done
ensure_build_dir
if [ $(uname -m) = "x86_64" ]; then
ensure_latest_ctr
fi
ensure_latest_ctr
process_volumes_args
say_warn "Starting a privileged shell prompt as root ..."
say_warn "WARNING: Your $CLH_ROOT_DIR folder will be bind-mounted in the container under $CTR_CLH_ROOT_DIR"