diff options
author | Ilyas Gasanov <torso.nafi@gmail.com> | 2019-03-23 01:49:31 +0300 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2019-04-15 16:48:13 +0000 |
commit | 5b30dd35b61b5b361c6e706de1fb364897b28584 (patch) | |
tree | e9b8602ce99f478ba09f3c1c978bc56a5170775d | |
parent | 5decc49d4672d29c6b91fc01825b9dbef074b00a (diff) |
Add support for mirrors.ilyas-2019-03-23
* 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.
-rwxr-xr-x | baiji | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -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) |