Skip to content

set up containers-storage in supermin cache #4286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+63 −45
Open

set up containers-storage in supermin cache #4286

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43c9c43
set up containers-storage in supermin cache
dustymabe Aug 21, 2025
7e54598
cmd-build-with-buildah: unify more the direct and non-direct paths
dustymabe Aug 21, 2025
57e8499
cmdlib: specify repo path for import_oci_archive()
dustymabe Aug 26, 2025
b9dbc5c
cmd-build-with-buildah: clean up overrides repo metadata
dustymabe Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 21 additions & 20 deletions src/cmd-build-with-buildah
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ build_with_buildah() {
# This is analogous to the chmod we do in cmdlib.sh in the legacy path.
chmod -R gu-s "${tempdir}/src"

tmp_oci_archive_path=$(realpath "${tempdir}/out.ociarchive")

initconfig="src/config.json"
if [ -f "${initconfig}" ]; then
variant="$(jq --raw-output '."coreos-assembler.config-variant"' "${initconfig}")"
Expand Down Expand Up @@ -169,31 +167,34 @@ build_with_buildah() {
set -- "$@" -v "$(realpath overrides)":/run/src/overrides
fi

if [ -n "$DIRECT" ]; then
# output to a tag since it's more convenient for development;
# buildah doesn't support doing both at once
# shellcheck disable=SC1090
osname=$(source "src/config/${argsfile}"; echo "${NAME}")
final_ref="containers-storage:localhost/${osname}:${VERSION}"
else
# In the supermin path ensure the ociarchive gets compressed
set -- "$@" --disable-compression=false
final_ref="oci-archive:${tmp_oci_archive_path}"
fi
# We'll also copy to an intermediate ociarchive file before
# passing that ociarchive to cosa import
tmp_oci_archive="oci-archive:$(realpath "${tempdir}/out.ociarchive")"

# and finally, add the tag and context dir
set -- "$@" -t "${final_ref}" .
# Set the output tag to be something unique
# shellcheck disable=SC1090
osname=$(source "src/config/${argsfile}"; echo "${NAME}")
final_ref="containers-storage:localhost/${osname}:${VERSION}"
# and add the unique tag and context dir to the command
set -- "$@" --tag "${final_ref}" .

echo "Running:" buildah "$@"
if [ -n "$DIRECT" ]; then
env -C "${tempdir}/src" buildah "$@"
cmd="bash"
else
/usr/lib/coreos-assembler/cmd-supermin-run --cache \
env -C "${tempdir}/src" TMPDIR="$(realpath cache)" buildah "$@"
cmd="/usr/lib/coreos-assembler/cmd-supermin-run --cache"
fi
cat <<EOF > "${tempdir}/build-with-buildah-script.sh"
set -euxo pipefail
env -C ${tempdir}/src TMPDIR=$(realpath cache) buildah $@
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I usually wouldn't worry about spaces the way Gemini did, but there's an easy way I think to do this which is to use \"\$@\" here and then just pass the arguments when you call $cmd below.

skopeo copy --quiet "${final_ref}" "${tmp_oci_archive}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I'm OK with this but can we switch the shutil.copy here to use cp-reflink like here. Otherwise this may incur a full additional copy in the direct path.

EOF
chmod +x "${tempdir}/build-with-buildah-script.sh"
$cmd "${tempdir}/build-with-buildah-script.sh"

/usr/lib/coreos-assembler/cmd-import "${final_ref}" ${SKIP_PRUNE:+--skip-prune}

# Finally import the ociarchive
/usr/lib/coreos-assembler/cmd-import \
"${tmp_oci_archive}" ${SKIP_PRUNE:+--skip-prune}
rm -rf "${tempdir}"
}

Expand Down