Skip to content

src/oscontainer.py: Add pkglist.txt to container root #661

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

Merged
merged 1 commit into from
Jul 24, 2019
Merged

src/oscontainer.py: Add pkglist.txt to container root #661

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 12 additions & 3 deletions src/oscontainer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
import gi

gi.require_version('OSTree', '1.0')
gi.require_version('RpmOstree', '1.0')

from gi.repository import GLib, Gio, OSTree
from gi.repository import GLib, Gio, OSTree, RpmOstree

import argparse
import json
Expand Down Expand Up @@ -88,8 +89,8 @@ def oscontainer_extract(containers_storage, src, dest,
# Given an OSTree repository at src (and exactly one ref) generate an
# oscontainer with it.
def oscontainer_build(containers_storage, src, ref, image_name_and_tag,
base_image, push=False, tls_verify=True, cert_dir="",
authfile="", inspect_out=None):
base_image, push=False, tls_verify=True,
cert_dir="", authfile="", inspect_out=None):
r = OSTree.Repo.new(Gio.File.new_for_path(src))
r.open(None)

Expand Down Expand Up @@ -117,6 +118,14 @@ def oscontainer_build(containers_storage, src, ref, image_name_and_tag,
print("Copying ostree commit into container: {} ...".format(rev))
run_verbose(["ostree", "--repo=" + dest_repo, "pull-local", src, rev])

# Generate pkglist.txt in to the oscontainer at /
pkg_list_dest = os.path.join(mnt, 'pkglist.txt')
pkgs = RpmOstree.db_query_all(r, rev, None)
with open(pkg_list_dest, 'w') as f:
for pkg in sorted(pkgs):
f.write(pkg.get_nevra())
f.write('\n')

# We use /noentry to trick `podman create` into not erroring out
# on a container with no cmd/entrypoint. It won't actually be run.
config = ['--entrypoint', '["/noentry"]',
Expand Down