From 5b30dd35b61b5b361c6e706de1fb364897b28584 Mon Sep 17 00:00:00 2001 From: Ilyas Gasanov Date: Sat, 23 Mar 2019 01:49:31 +0300 Subject: Add support for mirrors. * Baiji can now cross-bootstrap images for different distributions, e.g. Ubuntu from Debian, and vice versa. * debootstrap now uses sane default mirror, which should work regardless of the actual host distribution. --- baiji | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/baiji b/baiji index f39d051..ce88c91 100755 --- a/baiji +++ b/baiji @@ -88,10 +88,12 @@ def fakeroot_filter(info): # Commands -@cmd(arg("--dist", default = "jessie", +@cmd(arg("--dist", default = "jessie", help = "distribution for base docker image"), - arg("--tag", default = "baiji:jessie", + arg("--tag", default = "baiji:jessie", help = "tag to use for constructed base docker image"), + arg("--mirror", default = "http://deb.debian.org/debian/", + help = "mirror URL to pull packages from"), ) def create(args): """ @@ -103,7 +105,8 @@ def create(args): with tempdir() as dn: subprocess.check_call(("fakeroot", "/usr/sbin/debootstrap", - "--foreign", "--variant=buildd", args.dist, dn)) + "--foreign", "--variant=buildd", + args.dist, dn, args.mirror)) with Docker("import", "-", args.tag, stdin = subprocess.PIPE) as docker: with tarfile.open(mode = "w|", fileobj = docker.stdin) as tar: tar.add(dn, ".", filter = fakeroot_filter) -- cgit v1.2.3