-
Notifications
You must be signed in to change notification settings - Fork 25
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
Add Custom Repo Support For Jammy #412
Add Custom Repo Support For Jammy #412
Conversation
3e6d15c
to
c4d58d0
Compare
outPath := filepath.Join("/tmp/out", name) | ||
keySt = worker.Run( | ||
// dearmor key if necessary | ||
ShArgs(fmt.Sprintf("cat '%s' | gpg --dearmor --output '%s'", inPath, outPath)), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ShArgs(fmt.Sprintf("cat '%s' | gpg --dearmor --output '%s'", inPath, outPath)), | |
ShArgs(fmt.Sprintf("gpg --dearmor --output '%s' < '%s'", inPath, outPath)), |
This removes an extra call to cat
return dalec.WithRunOptions(withRepos, withData, keyMounts), nil | ||
} | ||
|
||
func installPackages(ls []string, rOpts ...llb.RunOption) llb.RunOption { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since this is returning a RunOption
does it need to accept run options?
I think we should be able to append the repo/key stuff separately.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM for now, the issues added are just nits in some of the code structure, we can address later.
Pulling this in to prepare for release.
Had to open a fix for the custom repo tests: #415 |
What this PR does / why we need it:
This is a follow up PR to #366. With this PR Dalec now accepts specifying dependencies from outside package repos on Jammy targets.
Which issue(s) this PR fixes (optional, using
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when the PR gets merged):Fixes #211
Special notes for your reviewer: