Add support for the Pebble entrypoint #205
Merged
Conversation
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
'pebble enter' is the OCI entrypoint for all ROCKs. This commit is therefore deprecating the use of the 'entrypoint' and 'cmd' fields in rockcraft.yaml, in favour of a new 'services' field, representing the Pebble services to be written into a new Pebble layer inside the ROCK's filesystem.
cjdcordeiro
force-pushed
the
ROCKS-434_add-pebble-services-support
branch
5 times, most recently
from
321b160
to
448551c
Compare
|
canonical/pebble#188 is already approved and should be getting merged any time now...I've already created a Pebble snap with that version of Pebble, so this PR can now be reviewed |
|
fyi: multi-arch snaps in https://snapcraft.io/pebble |
tigarmo
reviewed
Mar 30, 2023
tigarmo
requested changes
Mar 31, 2023
|
Here's a question for @sergiusens and @cjdcordeiro ; when we merge this PR, everyone's rockcraft.yaml files will be broken. Do we want to pre-warn the users, via I don't know Mattermost, a few days in advance? It's not like they can do anything until the update drops, but at least they won't be caught completely by surprise. |
I'd say so. More than that, it would probably be worth creating a |
Docker Hub is fast but the Ubuntu images are updated infrequently and the registry itself has pull limits for anonymous users. This limit is annoying because currently rockcraft does not caching of base images. The caching is coming, but in the meantime switch to Amazon ECR. The registry has newer images and is only a little bit slower (from testing) than Docker Hub).
Split the walking of the layer directory into a new function, which returns the mapping from paths to arcnames. This is a step to simplify usrmerge handling, as the original function was already too crowded. No functional changes.
The situation is this: the primed payload has two distinct directories (e.g. bin/dir1 and usr/bin/dir1) that, because of the usrmerge handling, "point" to the same location (in this case, /usr/bin/dir1). We check that the two directories have the same attributes (ownership and mode) and then add a single entry to the layer (either one, they are all equivalent). All other cases (dirs with different attributes, conflicts between files) raise errors. The reason for this is that we haven't seen this come up "in the wild" yet, and it's hard to choose a behavior when we don't know the circunstances. Fixes canonical#203
Signed-off-by: Callahan Kovacs <[email protected]>
The runner is EoL. actions/runner-images#6002 Signed-off-by: Callahan Kovacs <[email protected]>
…ical#207) When rockcraft is installed or refreshed, the snap configure hook will remove outdated images and instances from LXD. Signed-off-by: Callahan Kovacs <[email protected]>
Craft-parts 1.18.4 makes the /dev rbind mount private, fixing chroot and overlayfs mounts when using lxd 5.11. Fixes canonical#195. Signed-off-by: Claudio Matsuoka <[email protected]>
Lxd was pinned down to version 5.9 to work around the overlayfs issue reported in canonical#195. With this fix, this should no longer be necessary. Signed-off-by: Claudio Matsuoka <[email protected]>
When Rockcraft creates the tar archive from the priming area, subdirs symlinks are skipped from archive. Solution is to add subdirs when they are symlinks. Fix canonical#208 --------- Co-authored-by: Tiago Nobrega <[email protected]>
…anonical#214) * deps: Add jammy version of python-apt
Craft-parts 1.19.0 requires overlays to be enabled. Signed-off-by: Claudio Matsuoka <[email protected]>
Signed-off-by: Claudio Matsuoka <[email protected]>
Co-authored-by: Tiago Nobrega <[email protected]> fix: spread tests fix: linting fix: re-add set_entrypoint to lifecycle and fix tasks fix: small refactoring and updates Update rockcraft/pebble.py Co-authored-by: Tiago Nobrega <[email protected]> Update tests/unit/test_pebble.py Co-authored-by: Tiago Nobrega <[email protected]> fix: add missing imports
cjdcordeiro
force-pushed
the
ROCKS-434_add-pebble-services-support
branch
2 times, most recently
from
30f2351
to
1c88fdc
Compare
tigarmo
approved these changes
Apr 11, 2023
cjdcordeiro
changed the title
cmatsuoka
approved these changes
Apr 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Needs canonical/pebble#188.
TODO:Once the above PRs are merged:- re-run the tests- update the Tutorials and How-to guidesIn this PR:
the
servicesfield is added to the Rockcraft project, with a lightweight validation according to the spec from https://github.com/canonical/pebble#layer-specificationthe OCI entrypoint is fixed to always be
pebble enterthe OCI cmd is
nullthe implicit
pebblepart now also creates the$PEBBLEpath, where the Pebble layer is later be writtenentrypointandcmdare kept, but marked as deprecated, printing an error message and exiting the build whenever they are usedthe Reference docs are updated
updated how-to guides and tutorial
adjusted all spread tests
Have you signed the CLA?