This repository was archived by the owner on Mar 27, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 237
Remove Docker dependency for retrieving image filesystem #97
Closed
Closed
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
fb56153
add support for 'daemon' prefix to specify image in local docker daem…
nkubala a005f0c
fix test
nkubala 369759d
gazelle
nkubala d4db8be
wip; adding e2e tests for local docker images
nkubala f9d7987
add e2e test for local docker images
nkubala 0293e9a
remove redundant logic from image prepper. fix error handling
nkubala 8702bb7
fix tests
nkubala 6a1e169
allow overriding of image preppers from client. do not mutate imagepr…
nkubala 6de5efb
remove ImagePrepper. remove prefix, caller now retrieves correct prep…
nkubala File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,31 +17,26 @@ limitations under the License. | |
package util | ||
|
||
import ( | ||
"regexp" | ||
|
||
"github.com/containers/image/docker" | ||
"github.com/docker/docker/client" | ||
) | ||
|
||
// CloudPrepper prepares images sourced from a Cloud registry | ||
type CloudPrepper struct { | ||
ImagePrepper | ||
Source string | ||
Client *client.Client | ||
} | ||
|
||
func (p CloudPrepper) Name() string { | ||
return "Cloud Registry" | ||
} | ||
|
||
func (p CloudPrepper) GetSource() string { | ||
return p.ImagePrepper.Source | ||
return p.Source | ||
} | ||
|
||
func (p CloudPrepper) SupportsImage() bool { | ||
pattern := regexp.MustCompile("^.+/.+(:.+){0,1}$") | ||
image := p.ImagePrepper.Source | ||
if exp := pattern.FindString(image); exp != image || CheckTar(image) { | ||
return false | ||
} | ||
return true | ||
func (p CloudPrepper) GetImage() (Image, error) { | ||
return getImage(p) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is getImage used anywhere else? Should you just inline it here instead of breaking it out? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yeah it's actually the same across all the preppers (currently), but it made more sense to me to just have them all use a helper method and expose the |
||
} | ||
|
||
func (p CloudPrepper) GetFileSystem() (string, error) { | ||
|
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
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.
We should probably document the available image name flags somewhere, does it make sense here?
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.
yeah I should put it here. should also go in the README somewhere