fix: Wrap use of skopeo to avoid its unwanted side effects. #570
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
2 things are fixed here.
1. Running skopeo as root creates /run/containers with 700 permissions.
That causes a problem when you run skopeo as root and then run
stacker as non-root.
The error would look like this:
> error: initializing source ... getting username and password: 1 error occurred:
> * reading JSON file "/run/containers/0/auth.json":
> open /run/containers/0/auth.json: permission denied
> couldn't import base layer base
> stackerbuild.io/stacker/pkg/stacker.importContainersImage
> /stacker-tree/pkg/stacker/base.go:141
> stackerbuild.io/stacker/pkg/stacker.GetBase
> /stacker-tree/pkg/stacker/base.go:49
> stackerbuild.io/stacker/pkg/stacker.(*Builder).build
> /stacker-tree/pkg/stacker/build.go:407
> stackerbuild.io/stacker/pkg/stacker.(*Builder).BuildMultiple
> /stacker-tree/pkg/stacker/build.go:622
> main.doBuild
2. skopeo copy containers-registry populates ~/.local/share/containers/
This is an unwanted side effect of running the test. Further
annoying is that it ends up getting directories with 555 perms on
them. That means rm -Rf .local/share/containers/storage/vfs-layers
will fail like:
rm: cannot remove '.local/share/containers/storage/vfs/dir/HASH':
Permission denied
We don't want someone's HOME getting populated with artifacts from
stacker test, and there are probably also race conditions here in
that we run stacker tests in parallel.
Signed-off-by: Scott Moser <smoser@brickies.net>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #570 +/- ##
==========================================
+ Coverage 56.36% 57.12% +0.75%
==========================================
Files 64 64
Lines 7505 7505
==========================================
+ Hits 4230 4287 +57
+ Misses 2553 2477 -76
- Partials 722 741 +19 ☔ View full report in Codecov by Sentry. |
raharper
reviewed
Dec 1, 2023
| @@ -261,5 +279,5 @@ EOF | |||
| stacker clean | |||
| rm -rf folder1 | |||
| cd "$ROOT_DIR" | |||
| rm -rf "tmpdir" | |||
| rm -rf "$tmpdir" | |||
There was a problem hiding this comment.
worth mentioning you fixed a case where we left a tmpdir around when using test_copy_buffer_size I think.
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.
2 things are fixed here.
Running skopeo as root creates /run/containers with 700 permissions. That causes a problem when you run skopeo as root and then run stacker as non-root.
The error would look like this:
skopeo copy containers-registry populates ~/.local/share/containers/ This is an unwanted side effect of running the test. Further annoying is that it ends up getting directories with 555 perms on them. That means rm -Rf .local/share/containers/storage/vfs-layers will fail like:
rm: cannot remove '.local/share/containers/storage/vfs/dir/HASH':
Permission denied
We don't want someone's HOME getting populated with artifacts from stacker test, and there are probably also race conditions here in that we run stacker tests in parallel.
What type of PR is this?
Which issue does this PR fix:
What does this PR do / Why do we need it:
If an issue # is not available please add repro steps and logs showing the issue:
Testing done on this change:
Automation added to e2e:
Will this break upgrades or downgrades?
Does this PR introduce any user-facing change?:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.