From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMRmC-0003Va-IX for qemu-devel@nongnu.org; Sun, 10 Jul 2016 23:20:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMRmA-0002vF-Jv for qemu-devel@nongnu.org; Sun, 10 Jul 2016 23:20:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49227) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMRmA-0002vB-E5 for qemu-devel@nongnu.org; Sun, 10 Jul 2016 23:20:54 -0400 From: Fam Zheng Date: Mon, 11 Jul 2016 11:20:41 +0800 Message-Id: <1468207242-5015-4-git-send-email-famz@redhat.com> In-Reply-To: <1468207242-5015-1-git-send-email-famz@redhat.com> References: <1468207242-5015-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH RFC v4 3/4] docker: Support "QEMU_CHROOT" in dockerfiles List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org This allows a docker file to say "ENV QEMU_CHROOT /path/to/new/root" to indicate that the test execution should be done in a chroot in the container. Bind mount dev,sys,proc into QEMU_CHROOT to make them avaiable for testing scripts. The SYS_ADMIN is a required capability for mount, add it to the docker run command line. Signed-off-by: Fam Zheng --- tests/docker/Makefile.include | 1 + tests/docker/run | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c5546ee..e9821ba 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -107,6 +107,7 @@ docker-run-%: docker-qemu-src $(call quiet-command,\ $(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \ -t \ + --cap-add SYS_ADMIN \ $(if $(DEBUG),-i,--net=none) \ -e TARGET_LIST=$(TARGET_LIST) \ -e EXTRA_CONFIGURE_OPTS=$(EXTRA_CONFIGURE_OPTS) \ diff --git a/tests/docker/run b/tests/docker/run index 38ce789..4e80cc3 100755 --- a/tests/docker/run +++ b/tests/docker/run @@ -19,6 +19,18 @@ fi BASE="$(dirname $(realpath $0))" +# cp files into the chroot and execute there +if test -n "$QEMU_CHROOT"; then + mkdir -p $QEMU_CHROOT/$BASE + cp $BASE/* $QEMU_CHROOT/$BASE + QEMU_CHROOT_SAVE="$QEMU_CHROOT" + for bp in dev sys proc; do + mount --bind /$bp $QEMU_CHROOT/$bp + done + QEMU_CHROOT="" chroot $QEMU_CHROOT_SAVE $BASE/run "$@" + exit 0 +fi + # Prepare the environment . /etc/profile || true export PATH=/usr/lib/ccache:$PATH -- 2.7.4