Skip to content

extract RunCacheProbe function #284

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jul 31, 2024
Merged

extract RunCacheProbe function #284

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3c8066f
extract RunCacheProbe function
johnstcn Jul 26, 2024
eeb25c1
extract CABundle and docker config JSON init functions
johnstcn Jul 30, 2024
8349602
extract local cache registry func
johnstcn Jul 30, 2024
28aaec4
rm outdated comments
johnstcn Jul 31, 2024
2d4b8fd
xerrors -> fmt
johnstcn Jul 31, 2024
8d39505
rm DoCacheProbe invocation in Run
johnstcn Jul 31, 2024
a7b4d39
rm empty file
johnstcn Jul 31, 2024
ddfa66f
extract log.Writer func that allows stopping
johnstcn Jul 31, 2024
499bf17
log errors cleaning up docker config json in defer
johnstcn Jul 31, 2024
e15ecbc
defer options.UnsetEnv()
johnstcn Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions cmd/envbuilder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ func envbuilderCmd() serpent.Command {
Use: "envbuilder",
Options: o.CLI(),
Handler: func(inv *serpent.Invocation) error {
o.SetDefaults()
o.Logger = log.New(os.Stderr, o.Verbose)
if o.CoderAgentURL != "" {
if o.CoderAgentToken == "" {
Expand Down Expand Up @@ -63,6 +64,19 @@ func envbuilderCmd() serpent.Command {
}
}

if o.GetCachedImage {
img, err := envbuilder.RunCacheProbe(inv.Context(), o)
if err != nil {
o.Logger(log.LevelError, "error: %s", err)
}
digest, err := img.Digest()
if err != nil {
return fmt.Errorf("get cached image digest: %w", err)
}
_, _ = fmt.Fprintf(inv.Stdout, "ENVBUILDER_CACHED_IMAGE=%s@%s\n", o.CacheRepo, digest.String())
return nil
}

err := envbuilder.Run(inv.Context(), o)
if err != nil {
o.Logger(log.LevelError, "error: %s", err)
Expand Down
Loading