mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-20 09:39:08 +00:00
Merge a3a21985ce
into bc44cb899c
This commit is contained in:
commit
08a9c39f9c
@ -328,9 +328,6 @@ func (p Pkg) Build(bos ...BuildOpt) error {
|
|||||||
case bo.force:
|
case bo.force:
|
||||||
// force local build
|
// force local build
|
||||||
platformsToBuild = bo.platforms
|
platformsToBuild = bo.platforms
|
||||||
case bo.skipBuild:
|
|
||||||
// do not build anything if we explicitly did skipBuild
|
|
||||||
platformsToBuild = nil
|
|
||||||
default:
|
default:
|
||||||
// check local cache, fallback to check registry / pull image from registry, fallback to build
|
// check local cache, fallback to check registry / pull image from registry, fallback to build
|
||||||
_, _ = fmt.Fprintf(writer, "checking for %s in local cache...\n", ref)
|
_, _ = fmt.Fprintf(writer, "checking for %s in local cache...\n", ref)
|
||||||
@ -341,6 +338,8 @@ func (p Pkg) Build(bos ...BuildOpt) error {
|
|||||||
_, _ = fmt.Fprintf(writer, "found %s in local cache, skipping build\n", ref)
|
_, _ = fmt.Fprintf(writer, "found %s in local cache, skipping build\n", ref)
|
||||||
imageInLocalCache = true
|
imageInLocalCache = true
|
||||||
continue
|
continue
|
||||||
|
case bo.skipBuild:
|
||||||
|
// do nothing, we do not want to pull/build
|
||||||
case bo.pull:
|
case bo.pull:
|
||||||
// need to pull the image from the registry, else build
|
// need to pull the image from the registry, else build
|
||||||
_, _ = fmt.Fprintf(writer, "%s %s not found in local cache, trying to pull\n", ref, platform.Architecture)
|
_, _ = fmt.Fprintf(writer, "%s %s not found in local cache, trying to pull\n", ref, platform.Architecture)
|
||||||
|
Loading…
Reference in New Issue
Block a user