feat: Prefer local image #380
Closed
+396
−290
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
The gateway client has options which allow for fetching the image config locally before attempting to find it remotely. However, this commit is broken, since the `buildkit.Config` object now has a reference to a gateway client; however, `buildkit.SolveToLocal` requires a normal buildkit client. The following commit will replace `buildkit.SolveToLocal` with `buildkit.ExtractFileFromState`. Implement `buildkit.ExtractFileFromState` This code will still not compile, since the signature of `buildkit.SolveToLocal` is not satisfied by its calls. Replace `SolveToLocal` in `probeDPKGStatus` method In this case, we will write the status type to a file, which we thereafter read from the state as a single byte. Fix error in awk script There was a confusion in the awk script between bash arrays and awk arrays. You cannot pass in an awk array via the command line (see https://stackoverflow.com/a/33106291). The strings will be split by space to produce the array, so the parentheses are unnecessary here. Use `ExtractFileFromState` for dpkg `installUpdates` Read the bytes and return them, instead of writing them to the local filesystem. Use `ExtractFileFromState` in `unpackAndMergeUpdates` In dpkg.go APK: Use `ExtractFileFromState` for `upgradePackages` Do not use `SolveToLocal`. Use `ExtractFileFromState` for `probeRPMStatus` Replace `buildkit.SolveToLocal` in rpm.go In all places Update `patchWithContext` to pass the correct client Fix errors and achieve parity with `main` branch This commit passes the integration tests as well as the `main` branch does. Update unit tests Signed-off-by: Peter Engelbert <[email protected]>
pmengelbert
requested review from
jeremyrickard and
salaxander
as code owners
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.
Use gateway client for config resolution
Implement
buildkit.ExtractFileFromStateThis code will still not compile, since the signature of
buildkit.SolveToLocalis not satisfied by its calls.Replace
SolveToLocalinprobeDPKGStatusmethodIn this case, we will write the status type to a file, which we thereafter read from the state as a single byte.
Fix error in awk script
Use
ExtractFileFromStatefor dpkginstallUpdatesUse
ExtractFileFromStateinunpackAndMergeUpdatesAPK: Use
ExtractFileFromStateforupgradePackagesDo not use
SolveToLocal.Use
ExtractFileFromStateforprobeRPMStatusReplace
buildkit.SolveToLocalin rpm.goUpdate
patchWithContextto pass the correct clientFix errors and achieve parity with
mainbranchUpdate unit tests
Closes #177