Use auroraboot everywhere and position flags correctly

because they are ignored if the come after positional arguments

Signed-off-by: Dimitris Karakasilis <[email protected]>

.github/workflows/reusable-uki-test.yaml

@@ -101,9 +101,10 @@ jobs:
             -v $PWD/unpacked:/unpacked \
             -v $PWD/build:/result \
             -v $PWD/tests/assets/keys:/keys \
-            quay.io/kairos/osbuilder-tools:latest build-uki dir:/unpacked \
+            quay.io/kairos/auroraboot:latest build-uki \
             --output-dir /result --keys /keys --output-type container \
-            --single-efi-cmdline "myentry: foobar"
+            --single-efi-cmdline "myentry: foobar" \
+            dir:/unpacked
 
           docker load -i build/*.tar
           image=$(docker load -i build/*.tar | grep "Loaded image" | awk -F: '{ st = index($0,":");print substr($0,st+1)}' | xargs)

Earthfile

@@ -363,12 +363,11 @@ uki-iso:
     IF [ "$AURORABOOT_OVERLAY_DIR" != "" ]
         COPY $AURORABOOT_OVERLAY_DIR /overlay-iso
 
-        RUN --no-cache echo $AURORABOOT_FLAGS | xargs auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} --overlay-iso /overlay-iso $BASE_IMAGE 
+        RUN --no-cache echo $AURORABOOT_FLAGS | xargs -d' ' -I{} auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} --overlay-iso /overlay-iso {} $BASE_IMAGE 
     ELSE
-        RUN --no-cache echo $AURORABOOT_FLAGS | xargs auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} $BASE_IMAGE 
+        RUN --no-cache echo $AURORABOOT_FLAGS | xargs -d' ' -I{} auroraboot build-uki --output-dir /build/ -k /keys --output-type ${AURORABOOT_OUTPUT_TYPE} {} $BASE_IMAGE 
     END
 
-
     IF [ "$AURORABOOT_OUTPUT_TYPE" == "iso" ]
         SAVE ARTIFACT /build/*.iso AS LOCAL build/
     ELSE IF [ "$AURORABOOT_OUTPUT_TYPE" == "container" ]