diff options
author | Lars Wirzenius <liw@liw.fi> | 2020-09-06 10:06:16 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2020-09-06 10:06:16 +0000 |
commit | 876d6370e1e0b63eca488bd85639b8b0db659cd0 (patch) | |
tree | a48ac9256c743c4f69273ab6b4cebff727e3344d | |
parent | a6e9c1c04c5b85ddd43724243e300c9b3a8ee50b (diff) | |
parent | de81d116d21d74bf41ab1f0fd022c19a9224692c (diff) | |
download | ick-contractor-876d6370e1e0b63eca488bd85639b8b0db659cd0.tar.gz |
Merge branch 'image' into 'master'
Image
See merge request larswirzenius/contractor!20
-rwxr-xr-x | contractor | 3 | ||||
-rw-r--r-- | worker.vmdb | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -709,10 +709,13 @@ def main(): build.set_defaults(func=cmd_build, **manager_defaults) args = p.parse_args() + cli_v = args.verbose if args.use_default_config: load_default_config(args) if args.config: load_config(args.config, args) + if cli_v: + args.verbose = True setup_logging(args) args.func(args) diff --git a/worker.vmdb b/worker.vmdb index 264f7b8..5db8407 100644 --- a/worker.vmdb +++ b/worker.vmdb @@ -18,8 +18,6 @@ steps: - mount: / - - virtual-filesystems: / - - unpack-rootfs: / - debootstrap: buster @@ -27,6 +25,8 @@ steps: target: / unless: rootfs_unpacked + - virtual-filesystems: / + - apt: install packages: - linux-image-amd64 |