Skip to content
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

twoliter: add support for crane #305

Merged
merged 1 commit into from
Jun 25, 2024

Conversation

jmt-lab
Copy link
Contributor

@jmt-lab jmt-lab commented Jun 18, 2024

Description of changes:

  • Adds support for crane if it is available.

Testing done:

Testing is still underway, building core kit locally to use for tests on my dev instance

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

twoliter/src/lock.rs Show resolved Hide resolved
twoliter/src/lock.rs Outdated Show resolved Hide resolved
tools/image-tool/src/lib.rs Outdated Show resolved Hide resolved
tools/image-tool/src/lib.rs Outdated Show resolved Hide resolved
tools/image-tool/src/docker.rs Outdated Show resolved Hide resolved
tools/image-tool/src/crane.rs Outdated Show resolved Hide resolved
Copy link
Contributor

@bcressey bcressey left a comment

Choose a reason for hiding this comment

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

Looks good. Not much beyond what @cbgbt suggested.

twoliter/Cargo.toml Outdated Show resolved Hide resolved
tools/image-tool/src/lib.rs Outdated Show resolved Hide resolved
tools/image-tool/src/lib.rs Outdated Show resolved Hide resolved
@jmt-lab jmt-lab force-pushed the crane-support branch 11 times, most recently from 74ba77e to 74cfe60 Compare June 21, 2024 19:57
@jmt-lab jmt-lab marked this pull request as ready for review June 21, 2024 20:32
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Jun 21, 2024

Working on fixing the duplicate collision

tools/image-tool/src/lib.rs Outdated Show resolved Hide resolved
twoliter/src/lock.rs Outdated Show resolved Hide resolved
tools/image-tool/src/crane.rs Outdated Show resolved Hide resolved
tools/image-tool/src/crane.rs Outdated Show resolved Hide resolved
@jmt-lab jmt-lab force-pushed the crane-support branch 3 times, most recently from 882a53f to 2a01bef Compare June 24, 2024 18:44
tools/image-tool/src/cli.rs Outdated Show resolved Hide resolved
tools/image-tool/Cargo.toml Outdated Show resolved Hide resolved
twoliter/src/lock.rs Outdated Show resolved Hide resolved
twoliter/src/lock.rs Show resolved Hide resolved
@jmt-lab jmt-lab force-pushed the crane-support branch 2 times, most recently from 7bc5aaf to 5f37fa3 Compare June 25, 2024 21:06
tools/oci-cli-wrapper/src/lib.rs Outdated Show resolved Hide resolved
tools/oci-cli-wrapper/src/lib.rs Show resolved Hide resolved
@jmt-lab jmt-lab force-pushed the crane-support branch 3 times, most recently from bcb4e30 to 04055b9 Compare June 25, 2024 22:05
@jmt-lab
Copy link
Contributor Author

jmt-lab commented Jun 25, 2024

Fixed caching of kit images and overuse of temp directories. Reran tests with both docker and crane ensuring caching and the expected directory works

@jmt-lab
Copy link
Contributor Author

jmt-lab commented Jun 25, 2024

Fix comments per bens comments

@jmt-lab jmt-lab merged commit 13dc97b into bottlerocket-os:develop Jun 25, 2024
1 check passed
@jmt-lab jmt-lab deleted the crane-support branch June 25, 2024 23:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants