-
Notifications
You must be signed in to change notification settings - Fork 53
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.
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
Contrib: Deprecate torcx, ship containerd / docker as sysexts #1216
Merged
Merged
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
851009c
Install docker as a system extension, use manglefs script ( convert t…
krishjainx c026d9e
Remove app-arch/torcx from coreos-overlay
krishjainx 3d17f65
Create seperate docker and containerd sysext
krishjainx 2be2e88
Add manglefs script for containerd
krishjainx e5f1ecb
Only keep docker stuff in manglefs_docker
krishjainx e6bb547
Add mangle script for containerd
krishjainx 9709a64
incorporate suggestions from Jeremi
krishjainx 4b00bc1
tail, not head
krishjainx abe8bf6
Use helper function query_available_package()
krishjainx 4e8b276
Remove duplicate making directory root_fs_dir/etc/extensions
krishjainx fe949f5
Make sure binary packages are built in build_packages already
krishjainx f6f5c32
add information about the packages contained in the built sysext
krishjainx 4633cc3
Fix syntax errors, quoting
krishjainx 298e283
fix permissions issue
krishjainx 3c4639b
use sudo_clobber function
krishjainx cc029bb
use DEVCONTAINER=1
krishjainx 9cede02
dev_container_util.sh: remove spurious DEVCONTAINER=1
t-lo 9837c35
build_sysext: add sysext dependency handling
t-lo aae3fd8
prod_image_util.sh: remove pkgdb tarball (replaced by sysext)
t-lo 8f8f262
torcx: remove from scripts, use docker+containerd sysexts
t-lo 8e01a2c
build_image: add sysext command line option
t-lo c589fb8
coreos-overlay: removed all remaining app-torcx artifacts
t-lo 89555ed
base OS sysexts: separate build script, inventory generation
t-lo e85ca49
ci-automation: remove torcx artifact handling and tests
t-lo 6f651a2
build scripts: separate txt inventory; official naming for sysexts
t-lo 35779f1
run_local_tests.sh: script for running tests on local builds
t-lo bd54e3a
.github: removed torcx artifact handling from github CI
t-lo 8ef820a
vendor-testing/qemu_update.sh: make update payload configurable
t-lo 919d368
mantle-container: bump image ref to support torcx removal
t-lo 4285030
run_sdk_container: Add -U flag to use the version file unchanged
t-lo 6512ef0
overlay coreos-base/update_engine: remove torcx sanity check
t-lo 22582dc
changelog: add torcx removal, sysext migration
t-lo 57ed77e
ci-automation: fix local image detection for nightly SDKs
t-lo b775036
torcx removal: address PR comments
t-lo c2d1c13
Apply bash scripting suggestions from code review
t-lo 37cc05c
coreos/base/package.use: squashfs-tools: enable all compression formats
t-lo d744d32
build_sysext: optimise squashfs for size
t-lo 6dd2f20
run_local_tests.sh: un-break variable quoting
t-lo 65bf2bf
Update run_local_tests.sh: improve quoting
t-lo f81bbeb
build_sysext: run package inventorisation before mangle script
t-lo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add manglefs script for containerd
- Loading branch information
commit 2be2e884b3a24fb9ffb2cf91a3c64544b866876d
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pothos does this work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also don't quite understand why we first create a docker sysext pretending containerd is installed via
${PORTAGE_CONFIGROOT}/etc/portage/profile/package.provided
and then create a containerd sysext anyway.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was done to have a split containerd and Docker sysext setup. This way users can disable Docker but keep our containerd.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(The pretending of containerd being installed is to build the Docker sysext without containerd in it.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean whether the symlinking to etc at this phase of the build will work
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jepio to answer your question this works because of
scripts/build_library/build_image_util.sh
Lines 793 to 803 in 7c25545
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh I understand the intent, but I'd argue that if we want stackable / dependent sysexts then we should make the packages shipped with each layer explicit, and re-use these when we build the next "upper" layer.
I've extended build_sysext.sh to cover this, and updated build_image_util.sh to use it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That looks more complex than it needs to be. How about just mount the whole previous sysext when building the next one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sysexts do not contain package information since they only cover
/usr
(and/or/opt
). Installed packages are registered in sub-directories below/var/db/pkg
.(I wish this was easier though!)