[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 17/20] docker: debian-bootstrap.pre allow customi
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url |
Date: |
Mon, 2 Jul 2018 15:30:18 +0100 |
We default to the buildd variant as most of our images are for
building. However lets give the user the ability to specify "minbase"
if they want to create a simple base image for experimentation.
Allowing the tweaking of DEB_URL means we can also bootstrap other
Debian based OS's. For example:
make docker-binfmt-image-debian-ubuntu-bionic-arm64 \
DEB_ARCH=arm64 DEB_TYPE=bionic \
DEB_VARIANT=minbase DEB_URL=http://ports.ubuntu.com/ \
EXECUTABLE=./aarch64-linux-user/qemu-aarch64
Signed-off-by: Alex Bennée <address@hidden>
---
tests/docker/dockerfiles/debian-bootstrap.pre | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre
b/tests/docker/dockerfiles/debian-bootstrap.pre
index 7c76dce663..56e1aa7a21 100755
--- a/tests/docker/dockerfiles/debian-bootstrap.pre
+++ b/tests/docker/dockerfiles/debian-bootstrap.pre
@@ -32,6 +32,15 @@ if [ -z "${DEB_TYPE}" ]; then
fi
+# The following allow finer grain control over the defaults
+if [ -z "${DEB_VARIANT}" ]; then
+ DEB_VARIANT=buildd
+fi
+
+if [ -z "${DEB_URL}" ]; then
+ DEB_URL="http://httpredir.debian.org/debian"
+fi
+
# We check in order for
#
# - DEBOOTSTRAP_DIR pointing at a development checkout
@@ -107,5 +116,5 @@ fi
echo "Building a rootfs using ${FAKEROOT} and ${DEBOOTSTRAP}
${DEB_ARCH}/${DEB_TYPE}"
-${FAKEROOT} ${DEBOOTSTRAP} --variant=buildd --foreign --arch=$DEB_ARCH
$DEB_TYPE . http://httpredir.debian.org/debian || exit 1
+${FAKEROOT} ${DEBOOTSTRAP} --variant=$DEB_VARIANT --foreign --arch=$DEB_ARCH
$DEB_TYPE . $DEB_URL || exit 1
exit 0
--
2.17.1
- [Qemu-devel] [PATCH v3 08/20] build-system: add coverage-report target, (continued)
- [Qemu-devel] [PATCH v3 08/20] build-system: add coverage-report target, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 11/20] docker: filter out linux-user builds for mingw, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 20/20] docker: add linux-user powered cross builder for QEMU, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 16/20] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 12/20] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 19/20] docker: add special rule for deboostrapped images, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url,
Alex Bennée <=
- [Qemu-devel] [PATCH v3 15/20] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/07/02
- [Qemu-devel] [PATCH v3 18/20] docker: add special handling for FROM:debian-%-user targets, Alex Bennée, 2018/07/02
- Re: [Qemu-devel] [PATCH v3 00/20] Travis, Code Coverage and Cross Build updates, no-reply, 2018/07/02