mirror of
https://github.com/linuxkit/linuxkit.git
synced 2026-01-29 23:34:36 +00:00
Remove outputs from the yaml files
The latest version of the `moby` tool now requires that the output formats be specified in the CLI not in the yaml file. Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
@@ -17,7 +17,7 @@ clean_up() {
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
moby build -name "${NAME}" test.yml
|
||||
moby build -output kernel+initrd -name "${NAME}" test.yml
|
||||
[ -f "${NAME}-kernel" ] || exit 1
|
||||
[ -f "${NAME}-initrd.img" ] || exit 1
|
||||
[ -f "${NAME}-cmdline" ]|| exit 1
|
||||
|
||||
@@ -12,5 +12,3 @@ onboot:
|
||||
trust:
|
||||
image:
|
||||
- linuxkit/kernel
|
||||
outputs:
|
||||
- format: kernel+initrd
|
||||
|
||||
@@ -16,7 +16,7 @@ clean_up() {
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
moby build -name "${NAME}" test.yml
|
||||
moby build -output iso-bios -name "${NAME}" test.yml
|
||||
[ -f "${NAME}.iso" ] || exit 1
|
||||
linuxkit run qemu -iso "${NAME}.iso" | grep -q "Welcome to LinuxKit"
|
||||
exit 0
|
||||
|
||||
@@ -12,5 +12,3 @@ onboot:
|
||||
trust:
|
||||
image:
|
||||
- linuxkit/kernel
|
||||
outputs:
|
||||
- format: iso-bios
|
||||
|
||||
@@ -23,7 +23,7 @@ if command -v qemu-system-x86_64; then
|
||||
fi
|
||||
fi
|
||||
|
||||
moby build -name "${NAME}" test.yml
|
||||
moby build -output 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
|
||||
|
||||
@@ -12,5 +12,3 @@ onboot:
|
||||
trust:
|
||||
image:
|
||||
- linuxkit/kernel
|
||||
outputs:
|
||||
- format: iso-efi
|
||||
|
||||
@@ -17,7 +17,7 @@ clean_up() {
|
||||
|
||||
trap clean_up EXIT
|
||||
|
||||
moby build -name "${NAME}" test.yml
|
||||
moby build -output qcow2 -name "${NAME}" test.yml
|
||||
[ -f "${NAME}.qcow2" ] || exit 1
|
||||
linuxkit run qemu -disk-format qcow2 "${NAME}.qcow2" | grep -q "Welcome to LinuxKit"
|
||||
exit 0
|
||||
|
||||
@@ -12,5 +12,3 @@ onboot:
|
||||
trust:
|
||||
image:
|
||||
- linuxkit/kernel
|
||||
outputs:
|
||||
- format: qcow2
|
||||
|
||||
@@ -26,7 +26,7 @@ if [ -z "${QEMU}" ]; then
|
||||
exit $RT_CANCEL
|
||||
fi
|
||||
|
||||
moby build -name "${NAME}" test.yml
|
||||
moby build -output kernel+initrd -name "${NAME}" test.yml
|
||||
[ -f "${NAME}-kernel" ] || exit 1
|
||||
[ -f "${NAME}-initrd.img" ] || exit 1
|
||||
[ -f "${NAME}-cmdline" ]|| exit 1
|
||||
|
||||
@@ -12,5 +12,3 @@ onboot:
|
||||
trust:
|
||||
image:
|
||||
- linuxkit/kernel
|
||||
outputs:
|
||||
- format: kernel+initrd
|
||||
|
||||
Reference in New Issue
Block a user