Skip to content

install: Drop support for old skopeo#265

Merged
cgwalters merged 2 commits intobootc-dev:mainfrom
cgwalters:drop-skopeo-copy
Jan 17, 2024
Merged

install: Drop support for old skopeo#265
cgwalters merged 2 commits intobootc-dev:mainfrom
cgwalters:drop-skopeo-copy

Conversation

@cgwalters
Copy link
Copy Markdown
Collaborator

Let's just hard require a skopeo that can fetch from containers-storage. Motivated by #263 which was moving this code around.

@github-actions github-actions Bot added the area/install Issues related to `bootc install` label Jan 17, 2024
Copy link
Copy Markdown
Contributor

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The test claims that skopeo is too old.

Comment thread lib/src/install.rs Outdated
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");
Copy link
Copy Markdown
Contributor

@vrothberg vrothberg Jan 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@cgwalters
Copy link
Copy Markdown
Collaborator Author

The test claims that skopeo is too old.

Ah yes, ubuntu. I will look at excising this test.

@cgwalters
Copy link
Copy Markdown
Collaborator Author

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.

@rhatdan
Copy link
Copy Markdown
Contributor

rhatdan commented Jan 17, 2024

LGTM

@rhatdan
Copy link
Copy Markdown
Contributor

rhatdan commented Jan 17, 2024

@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 bootc-dev#263 which
was moving this code around.

Signed-off-by: Colin Walters <walters@verbum.org>
@cgwalters
Copy link
Copy Markdown
Collaborator Author

I think the comments here are basically addressed.

@cgwalters cgwalters merged commit 769fc7e into bootc-dev:main Jan 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/install Issues related to `bootc install`

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants