|
23 | 23 |
|
24 | 24 | BASE_OS_DISTRO = ['centos', 'debian', 'rocky', 'ubuntu']
|
25 | 25 | BASE_ARCH = ['x86_64', 'aarch64']
|
| 26 | +DEBIAN_ARCH = ['amd64', 'arm64'] |
26 | 27 | DEFAULT_BASE_TAGS = {
|
27 | 28 | 'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream9'},
|
28 | 29 | 'debian': {'name': 'debian', 'tag': 'bookworm'},
|
|
153 | 154 | cfg.StrOpt('base-arch', default=hostarch,
|
154 | 155 | choices=BASE_ARCH,
|
155 | 156 | help='The base architecture. Default is same as host.'),
|
156 |
| - cfg.StrOpt('debian-arch', default=debianarch), |
| 157 | + cfg.StrOpt('debian-arch', default=debianarch, |
| 158 | + choices=DEBIAN_ARCH, |
| 159 | + help='The base architecture used for downloading external ' |
| 160 | + 'packages. Default is derived from base-arch.'), |
157 | 161 | cfg.BoolOpt('use-dumb-init', default=True,
|
158 | 162 | help='Use dumb-init as init system in containers'),
|
159 | 163 | cfg.BoolOpt('debug', short='d', default=False,
|
@@ -377,5 +381,3 @@ def parse(conf, args, usage=None, prog=None,
|
377 | 381 |
|
378 | 382 | if not conf.base_image:
|
379 | 383 | conf.base_image = DEFAULT_BASE_TAGS[conf.base]['name']
|
380 |
| - |
381 |
| - conf.debian_arch = 'amd64' |
|
0 commit comments