install: Drop support for old skopeo #265
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
vrothberg
approved these changes
Jan 17, 2024
lib/src/install.rs
Outdated
| @@ -927,6 +890,9 @@ async fn prepare_install( | |||
|
|
|||
| let skopeo_supports_containers_storage = skopeo_supports_containers_storage() | |||
| .context("Failed to run skopeo (it currently must be installed in the host root)")?; | |||
| if !skopeo_supports_containers_storage { | |||
| anyhow::bail!("skopeo is too old"); | |||
There was a problem hiding this comment.
I think the skopeo_supports_containers_storage fn should error out with a message indicating the current / expected version of Skeop. "too old" will put the user on a journey figuring out the requirement.
Ah yes, ubuntu. I will look at excising this test. |
cgwalters
force-pushed
the
drop-skopeo-copy
branch
from
ef74c7c
to
921da2d
Compare
|
OK, I did some tweaking of the GH/ubuntu CI to build skopeo from git, which will also conveniently give us some integration testing as things change there. |
|
LGTM |
|
@vrothberg PTAL |
So that we can drop support for the hacky "copy to temporary OCI" code. Signed-off-by: Colin Walters <walters@verbum.org>
Let's just hard require a skopeo that can fetch from `containers-storage`. Motivated by containers#263 which was moving this code around. Signed-off-by: Colin Walters <walters@verbum.org>
cgwalters
force-pushed
the
drop-skopeo-copy
branch
from
99b8d8e
to
8e8e2a0
Compare
|
I think the comments here are basically addressed. |
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.
Let's just hard require a skopeo that can fetch from
containers-storage. Motivated by #263 which was moving this code around.