mirror of
https://github.com/cloud-hypervisor/cloud-hypervisor.git
synced 2024-12-22 21:55:20 +00:00
dev_cli: Enable pulling latest dev container on Arm
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:
parent
001ee6794c
commit
e1f35628e2
@ -239,9 +239,7 @@ cmd_build() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
ensure_build_dir
|
ensure_build_dir
|
||||||
if [ $(uname -m) = "x86_64" ]; then
|
|
||||||
ensure_latest_ctr
|
ensure_latest_ctr
|
||||||
fi
|
|
||||||
|
|
||||||
process_volumes_args
|
process_volumes_args
|
||||||
if [[ "$hypervisor" != "kvm" ]]; then
|
if [[ "$hypervisor" != "kvm" ]]; then
|
||||||
@ -280,9 +278,7 @@ cmd_clean() {
|
|||||||
cargo_args=("$@")
|
cargo_args=("$@")
|
||||||
|
|
||||||
ensure_build_dir
|
ensure_build_dir
|
||||||
if [ $(uname -m) = "x86_64" ]; then
|
|
||||||
ensure_latest_ctr
|
ensure_latest_ctr
|
||||||
fi
|
|
||||||
|
|
||||||
$DOCKER_RUNTIME run \
|
$DOCKER_RUNTIME run \
|
||||||
--user "$(id -u):$(id -g)" \
|
--user "$(id -u):$(id -g)" \
|
||||||
@ -346,9 +342,7 @@ cmd_tests() {
|
|||||||
set -- "$@" '--hypervisor' $hypervisor
|
set -- "$@" '--hypervisor' $hypervisor
|
||||||
|
|
||||||
ensure_build_dir
|
ensure_build_dir
|
||||||
if [ $(uname -m) = "x86_64" ]; then
|
|
||||||
ensure_latest_ctr
|
ensure_latest_ctr
|
||||||
fi
|
|
||||||
|
|
||||||
process_volumes_args
|
process_volumes_args
|
||||||
target="$(uname -m)-unknown-linux-${libc}"
|
target="$(uname -m)-unknown-linux-${libc}"
|
||||||
@ -479,9 +473,7 @@ cmd_build-container() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
ensure_build_dir
|
ensure_build_dir
|
||||||
if [ $(uname -m) = "x86_64" ]; then
|
|
||||||
ensure_latest_ctr
|
ensure_latest_ctr
|
||||||
fi
|
|
||||||
|
|
||||||
BUILD_DIR=/tmp/cloud-hypervisor/container/
|
BUILD_DIR=/tmp/cloud-hypervisor/container/
|
||||||
|
|
||||||
@ -514,9 +506,7 @@ cmd_shell() {
|
|||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
ensure_build_dir
|
ensure_build_dir
|
||||||
if [ $(uname -m) = "x86_64" ]; then
|
|
||||||
ensure_latest_ctr
|
ensure_latest_ctr
|
||||||
fi
|
|
||||||
process_volumes_args
|
process_volumes_args
|
||||||
say_warn "Starting a privileged shell prompt as root ..."
|
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"
|
say_warn "WARNING: Your $CLH_ROOT_DIR folder will be bind-mounted in the container under $CTR_CLH_ROOT_DIR"
|
||||||
|
Loading…
Reference in New Issue
Block a user