examples/bls: clean up Containerfile

There was some misleading comments here, the `RUN true` thing needed explanation, and we don't need to name the single stage. Signed-off-by: Allison Karlitskaya <[email protected]>
containers · Dec 5, 2024 · 2da53b2 · 2da53b2
1 parent 692d277
commit 2da53b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/examples/bls/Containerfile b/examples/bls/Containerfile
@@ -1,20 +1,5 @@
-# A special form of Containerfile for composefs-enabled UKI images
-# This file must have:
-#
-#  - a stage called 'base' which contains all of the
-#    files of the final image, but not the kernel
-#
-#  - further stages, ultimately resulting in the final container image.  In
-#    this image, the kernel must be present in a whiteout-obscured directory
-#    /composefs-meta/boot/ and otherwise no other changes may be made vs. the
-#    base image.  This is best-accomplished with a multi-stage build.
-#
-#  - during the build stages following 'base', the `COMPOSEFS_FSVERITY` build
-#    arg will be set to the fsverity digest of the container image.  This should
-#    be baked into the UKI.
-
 # Need 6.12 kernel from rawhide
-FROM fedora:rawhide AS base
+FROM fedora:rawhide
 COPY extra /
 COPY cfsctl /usr/bin
 RUN <<EOF
@@ -27,4 +12,4 @@ RUN <<EOF
     mv /boot /composefs-meta
     mkdir /boot
 EOF
-RUN true
+RUN true  # hack to get an extra layer
diff --git a/examples/bls/build b/examples/bls/build
@@ -21,7 +21,6 @@ mkdir -p tmp/sysroot/composefs tmp/sysroot/var
 
 ${PODMAN_BUILD} \
     --iidfile=tmp/base.iid \
-    --target=base \
     "$@" \
     .
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,6 @@ mkdir -p tmp/sysroot/composefs tmp/sysroot/var @@
     ${PODMAN_BUILD} \
         --iidfile=tmp/base.iid \
-        --target=base \
         "$@" \
         .
@@ Expand Down @@