Change "output" to "format" in moby tool

This is less confusing as there is also an output option to set the file.

See https://github.com/moby/tool/pull/146

Signed-off-by: Justin Cormack <justin.cormack@docker.com>

Makefile

@@ -21,7 +21,7 @@ endif
 PREFIX?=/usr/local/
 
 MOBY_REPO=https://github.com/moby/tool.git
-MOBY_COMMIT=69596e17ddb01fc3d3e75774bffeb760812b2f97
+MOBY_COMMIT=1ff0e3beeeb1e741b9c5a54574f01ac5eee525a5
 MOBY_VERSION=0.0
 bin/moby: tmp_moby_bin.tar | bin
 	tar xf $<

README.md

@@ -45,7 +45,7 @@ Once you have built the tool, use
 ```
 moby build linuxkit.yml
 ```
-to build the example configuration. You can also specify different output formats, eg `moby build -output raw linuxkit.yml` to
+to build the example configuration. You can also specify different output formats, eg `moby build -format raw linuxkit.yml` to
 output a raw bootable disk image. See `moby build -help` for more information.
 
 ### Booting and Testing
@@ -102,7 +102,7 @@ To customise, copy or modify the [`linuxkit.yml`](linuxkit.yml) to your own `fil
 generate its specified output. You can run the output with `linuxkit run file`.
 
 The yaml file specifies a kernel and base init system, a set of containers that are built into the generated image and started at boot time. You can specify the type
-of artifact to build with the `moby` tool eg `moby build -output vhd linuxkit.yml`.
+of artifact to build with the `moby` tool eg `moby build -format vhd linuxkit.yml`.
 
 If you want to build your own packages, see this [document](docs/packages.md).
 

docs/platform-aws.md

@@ -22,7 +22,7 @@ export AWS_REGION=eu-west-1
 AWS requires a `RAW` image. To create one:
 
 ```
-$ moby build -output raw examples/aws.yml
+$ moby build -format raw examples/aws.yml
 ```
 
 ## Push image

docs/platform-azure.md

@@ -23,7 +23,7 @@ here](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-gro
 
 ## Build an image
 
-Create a new `azure.yml` file [based on the Azure example](../examples/azure.yml), generate a new SSH key and add it in the `yml`, then `moby build -output vhd azure.yml`.
+Create a new `azure.yml` file [based on the Azure example](../examples/azure.yml), generate a new SSH key and add it in the `yml`, then `moby build -format vhd azure.yml`.
 
 
 This will output a `azure.vhd` image.

docs/platform-gcp.md

@@ -50,11 +50,11 @@ Make sure to download the credentials in JSON format and store them somewhere sa
 
 ## Build an image
 
-When using `moby build ...` to build an image, specify `-output gcp` to
+When using `moby build ...` to build an image, specify `-format gcp` to
 build an image in a format that GCP will understand. For example:
 
 ```
-moby build -output gcp myprefix.yml
+moby build -format gcp myprefix.yml
 ```
 
 This will create a local `myprefix.img.tar.gz` compressed image file.

projects/ima-namespace/Makefile

@@ -3,7 +3,7 @@ run: ima-namespace-kernel
 	../../bin/linuxkit run ima-namespace
 
 ima-namespace-kernel: ima-namespace.yml
-	../../bin/moby build -output kernel+initrd ima-namespace
+	../../bin/moby build -format kernel+initrd ima-namespace
 
 .PHONY: clean
 clean:

projects/kubernetes/Makefile

@@ -13,10 +13,10 @@ push-container-images:
 build-vm-images: kube-master.iso kube-node.iso
 
 kube-master.iso: kube-master.yml
-	moby build -name kube-master -output iso-efi -output iso-bios kube-master.yml
+	moby build -name kube-master -format iso-efi -format iso-bios kube-master.yml
 
 kube-node.iso: kube-node.yml
-	moby build -name kube-node -output iso-efi -output iso-bios kube-node.yml
+	moby build -name kube-node -format iso-efi -format iso-bios kube-node.yml
 
 clean:
 	rm -f -r \

test/Makefile

@@ -31,7 +31,7 @@ gcp-hack: ../artifacts/test.img.tar.gz
 ../artifacts/test.img.tar.gz:
 	rm -rf ../artifacts
 	mkdir -p ../artifacts
-	$(MOBY) build -output gcp -pull -name ../artifacts/test hack/test.yml
+	$(MOBY) build -format gcp -pull -name ../artifacts/test hack/test.yml
 
 define check_test_log
 	@cat $1 |grep -q 'test suite PASSED'
@@ -40,7 +40,7 @@ endef
 .PHONY: ltp
 ltp: export CLOUDSDK_IMAGE_NAME?=test-ltp
 ltp: $(LINUXKIT) test-ltp.img.tar.gz
-	$(MOBY) build -output gcp -pull hack/test-ltp.yml
+	$(MOBY) build -format gcp -pull hack/test-ltp.yml
 	$(LINUXKIT) push gcp test-ltp.img.tar.gz
 	$(LINUXKIT) run gcp -skip-cleanup -machine n1-highcpu-4 $(CLOUDSDK_IMAGE_NAME) | tee test-ltp.log
 	$(call check_test_log, test-ltp.log)

test/cases/000_build/000_outputs/000_kernel+initrd/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output kernel+initrd -name "${NAME}" ../test.yml
+moby build -format kernel+initrd -name "${NAME}" ../test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ] || exit 1

test/cases/000_build/000_outputs/001_iso-bios/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output iso-bios -name "${NAME}" ../test.yml
+moby build -format iso-bios -name "${NAME}" ../test.yml
 [ -f "${NAME}.iso" ] || exit 1
 
 exit 0

test/cases/000_build/000_outputs/002_iso-efi/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output iso-efi -name "${NAME}" ../test.yml
+moby build -format iso-efi -name "${NAME}" ../test.yml
 [ -f "${NAME}-efi.iso" ] || exit 1
 
 exit 0

test/cases/000_build/000_outputs/003_gcp/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output gcp -name "${NAME}" ../test.yml
+moby build -format gcp -name "${NAME}" ../test.yml
 [ -f "${NAME}.img.tar.gz" ] || exit 1
 
 exit 0

test/cases/000_build/000_outputs/004_raw/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output raw -name "${NAME}" ../test.yml
+moby build -format raw -name "${NAME}" ../test.yml
 [ -f "${NAME}.raw" ] || exit 1
 
 exit 0

test/cases/000_build/000_outputs/005_qcow2/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output qcow2 -name "${NAME}" ../test.yml
+moby build -format qcow2 -name "${NAME}" ../test.yml
 [ -f "${NAME}.qcow2" ] || exit 1
 
 exit 0

test/cases/000_build/000_outputs/006_vhd/test.sh

@@ -19,7 +19,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output vhd -name "${NAME}" ../test.yml
+moby build -format vhd -name "${NAME}" ../test.yml
 [ -f "${NAME}.vhd" ] || exit 1
 
 exit 0

test/cases/000_build/000_outputs/007_vmdk/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output vmdk -name "${NAME}" ../test.yml
+moby build -format vmdk -name "${NAME}" ../test.yml
 [ -f "${NAME}.vmdk" ] || exit 1
 
 exit 0

test/cases/010_platforms/000_qemu/000_run_kernel/test.sh

@@ -17,7 +17,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output kernel+initrd -name "${NAME}" test.yml
+moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1

test/cases/010_platforms/000_qemu/010_run_iso/test.sh

@@ -16,7 +16,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output iso-bios -name "${NAME}" test.yml
+moby build -format iso-bios -name "${NAME}" test.yml
 [ -f "${NAME}.iso" ] || exit 1
 linuxkit run qemu -iso "${NAME}.iso" | grep -q "Welcome to LinuxKit"
 exit 0

test/cases/010_platforms/000_qemu/020_run_efi/test.sh

@@ -27,7 +27,7 @@ if command -v qemu-system-x86_64; then
 	fi
 fi
 
-moby build -output iso-efi -name "${NAME}" test.yml
+moby build -format iso-efi -name "${NAME}" test.yml
 [ -f "${NAME}-efi.iso" ] || exit 1
 linuxkit run qemu -iso -uefi "${NAME}-efi.iso" | grep -q "Welcome to LinuxKit"
 exit 0

test/cases/010_platforms/000_qemu/030_run_qcow/test.sh

@@ -17,7 +17,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output qcow2 -name "${NAME}" test.yml
+moby build -format qcow2 -name "${NAME}" test.yml
 [ -f "${NAME}.qcow2" ] || exit 1
 linuxkit run qemu "${NAME}.qcow2" | grep -q "Welcome to LinuxKit"
 exit 0

test/cases/010_platforms/000_qemu/040_run_raw/test.sh

@@ -17,7 +17,7 @@ clean_up() {
 
 trap clean_up EXIT
 
-moby build -output raw -name "${NAME}" test.yml
+moby build -format raw -name "${NAME}" test.yml
 [ -f "${NAME}.raw" ] || exit 1
 linuxkit run qemu "${NAME}.raw" | grep -q "Welcome to LinuxKit"
 exit 0

test/cases/010_platforms/000_qemu/100_container/test.sh

@@ -28,7 +28,7 @@ if [ -z "${QEMU}" ]; then
     exit $RT_CANCEL
 fi
 
-moby build -output kernel+initrd -name "${NAME}" test.yml
+moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1

test/cases/010_platforms/010_hyperkit/000_run_kernel/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -output kernel+initrd -name "${NAME}" test.yml
+moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1

test/cases/010_platforms/010_hyperkit/010_acpi/test.sh

@@ -18,7 +18,7 @@ clean_up() {
 }
 trap clean_up EXIT
 
-moby build -output kernel+initrd -name "${NAME}" test.yml
+moby build -format kernel+initrd -name "${NAME}" test.yml
 [ -f "${NAME}-kernel" ] || exit 1
 [ -f "${NAME}-initrd.img" ] || exit 1
 [ -f "${NAME}-cmdline" ]|| exit 1

test/cases/020_kernel/000_config_4.4.x/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-kernel-config.yml
+moby build -format kernel+initrd test-kernel-config.yml
 RESULT="$(linuxkit run test-kernel-config)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/001_config_4.9.x/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-kernel-config.yml
+moby build -format kernel+initrd test-kernel-config.yml
 RESULT="$(linuxkit run test-kernel-config)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/004_config_4.12.x/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-kernel-config.yml
+moby build -format kernel+initrd test-kernel-config.yml
 RESULT="$(linuxkit run test-kernel-config)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/010_kmod_4.9.x/test.sh

@@ -23,7 +23,7 @@ docker pull linuxkit/kernel:4.9.46
 docker build -t ${IMAGE_NAME} .
 
 # Build and run a LinuxKit image with kernel module (and test script)
-moby build -output kernel+initrd kmod.yml
+moby build -format kernel+initrd kmod.yml
 RESULT="$(linuxkit run kmod)"
 echo "${RESULT}" | grep -q "Hello LinuxKit"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/012_echo-tcp-ipv4-short-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/015_echo-tcp-ipv4-long-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/016_echo-tcp-ipv4-long-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/017_echo-tcp-ipv4-long-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/020_echo-tcp-ipv6-short-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/021_echo-tcp-ipv6-short-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/022_echo-tcp-ipv6-short-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/025_echo-tcp-ipv6-long-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/026_echo-tcp-ipv6-long-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/027_echo-tcp-ipv6-long-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/030_echo-udp-ipv4-short-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/031_echo-udp-ipv4-short-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/032_echo-udp-ipv4-short-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/035_echo-udp-ipv4-long-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/036_echo-udp-ipv4-long-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/037_echo-udp-ipv4-long-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/040_echo-udp-ipv6-short-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/041_echo-udp-ipv6-short-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/042_echo-udp-ipv6-short-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/045_echo-udp-ipv6-long-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/046_echo-udp-ipv6-long-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/010_veth/047_echo-udp-ipv6-long-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/010_echo-short-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/011_echo-short-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/012_echo-short-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/015_echo-long-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/016_echo-long-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/050_unix-domain/017_echo-long-5con-multi/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/010_veth-unix-domain-echo/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/011_veth-unix-domain-echo-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/012_veth-ipv4-echo/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/013_veth-ipv6-echo/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/014_veth-tcp-echo/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/015_veth-udp-echo/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/000_kernel-4.4.x/100_mix/020_unix-domain-echo/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/010_echo-tcp-ipv4-short-1con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/011_echo-tcp-ipv4-short-10con-single/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"
 

test/cases/020_kernel/110_namespace/001_kernel-4.9.x/010_veth/012_echo-tcp-ipv4-short-5con-multi-reverse/test.sh

@@ -15,7 +15,7 @@ clean_up() {
 trap clean_up EXIT
 
 # Test code goes here
-moby build -output kernel+initrd test-ns.yml
+moby build -format kernel+initrd test-ns.yml
 RESULT="$(linuxkit run -cpus 2 test-ns)"
 echo "${RESULT}" | grep -q "suite PASSED"