File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -41,7 +41,7 @@ Usage: coreos-assembler build --help
41
41
42
42
Additional environment variables supported:
43
43
44
- RPMOSTREE_EXTRA_ARGS To pass extra arguments to 'rpm-ostree compose tree ...'
44
+ COSA_RPMOSTREE_ARGS To pass extra arguments to 'rpm-ostree compose tree ...'
45
45
RPMOSTREE_PRESERVE_TMPDIR To keep the temporary compose rootfs from 'rpm-ostree compose tree ...'
46
46
47
47
EOF
@@ -356,7 +356,7 @@ if [ ! -f "${workdir}"/builds/builds.json ] && [ ! -f "${fetch_stamp}" ] ; then
356
356
fi
357
357
composefs=" $( jq -r .composefs < " ${image_json} " ) "
358
358
case " ${composefs} " in
359
- false)
359
+ false)
360
360
;;
361
361
true)
362
362
ostree config --repo=" ${tmprepo} " set ex-integrity.composefs " true"
@@ -465,7 +465,7 @@ if [ "${commit}" == "${previous_commit}" ] && \
465
465
ostree_tarfile_path=$( jq -r ' .images.ostree.path' < " ${previous_builddir} /meta.json" )
466
466
cp-reflink " ${previous_builddir} /${previous_ostree_tarfile_path} " " ${ostree_tarfile_path} "
467
467
ostree_tarfile_sha256=$( jq -r ' .images.ostree.sha256' < " ${previous_builddir} /meta.json" )
468
-
468
+
469
469
ostree_oci_manifest_path=" ${name} -${buildid} -ostree.${basearch} -manifest.json"
470
470
skopeo inspect --raw oci-archive:" ${ostree_tarfile_path} " > tmp/manifest.json
471
471
/usr/lib/coreos-assembler/finalize-artifact tmp/manifest.json " ${ostree_oci_manifest_path} "
497
497
" --label=io.openshift.build.versions=machine-os=${buildid} "
498
498
)
499
499
fi
500
-
500
+
501
501
last_build_manifest=()
502
502
if rpm-ostree compose container-encapsulate --help | grep -q -e " --previous-build-manifest" ; then
503
503
# Use the last stable release if buildfetch used
You can’t perform that action at this time.
0 commit comments