ci: rework build

builder.sh

@@ -43,34 +43,34 @@ echo "${buildid}" > .buildid
 
 echo "Composing ${VERSION}.${buildid} ..."
 
-# repos import
-cp images/shared/*.repo "${IMAGE_DIR}"
-cp "${IMAGE_DIR}"/{$IMAGE}/repos/*.repo "${IMAGE_DIR}"
+# --- REPOS IMPORT ---
+cp images/shared/*.repo "${IMAGE_DIR}/"
+cp "${IMAGE_DIR}"/repos/*.repo "${IMAGE_DIR}/"
 
-# Ensure manifest has correct ref and releasever 
-sed -i '/^ref:/d' "$MANIFEST" 
-sed -i '/^releasever:/d' "$MANIFEST" 
-sed -i "1i releasever: ${VERSION}" "$MANIFEST" 
+# --- MANIFEST FIXUPS ---
+# Remove existing ref: and releasever:
+sed -i '/^ref:/d' "$MANIFEST"
+sed -i '/^releasever:/d' "$MANIFEST"
+
+# Insert new values at top
+sed -i "1i releasever: ${VERSION}" "$MANIFEST"
 sed -i "1i ref: ${REF}" "$MANIFEST"
 
-#Run a optional per image script to do image specific things
-POSTPROCESS="${IMAGE_DIR}/${IMAGE}"/postprocess.sh"
-if [[ -x "${POSTPROCESS}" ]]; then
-    echo "Running postprocess script: ${POSTPROCESS}"
-    "${POSTPROCESS}"
+# --- OPTIONAL POSTPROCESS ---
+POSTPROCESS="$IMAGE_DIR/test.sh"
+if [[ -x "$POSTPROCESS" ]]; then
+    echo "Running postprocess script: $POSTPROCESS"
+    "$POSTPROCESS"
 else
     echo "No postprocess.sh found in ${IMAGE_DIR}, skipping."
 fi
 
-
 # --- COMPOSE IMAGE ---
 ARGS=(
     "--cachedir=cache"
-    "--initialize"
-    "--max-layers=96"
 )
 
-rpm-ostree compose image \
+rpm-ostree compose rootfs \
     "${ARGS[@]}" \
     "$MANIFEST" \
     "$OUTPUT"