Setting up initial tests for docker

Author: swrap

README.md

@@ -239,16 +239,19 @@ build -  Build an image from a Dockerfile
 Usage: img build [OPTIONS] PATH
 
 Flags:
-      --build-arg list   Set build-time variables
-  -f, --file string      Name of the Dockerfile (Default is 'PATH/Dockerfile')
-  -h, --help             help for build
-      --label list       Set metadata for an image
-      --no-cache         Do not use cache when building the image
-      --no-console       Use non-console progress UI
-  -o, --output string    BuildKit output specification (e.g. type=tar,dest=build.tar)
-      --platform list    Set platforms for which the image should be built
-  -t, --tag list         Name and optionally a tag in the 'name:tag' format
-      --target string    Set the target build stage to build
+      --build-arg list      Set build-time variables
+      --cache-from list     Images to consider as cache sources
+      --export-cache list   Image cache export location (synonymous to buildkit export-cache)
+  -f, --file string         Name of the Dockerfile (Default is 'PATH/Dockerfile')
+  -h, --help                help for build
+      --import-cache list   Image cache import location (synonymous to buildkit import-cache) takes precedence over 'cache-from'
+      --label list          Set metadata for an image
+      --no-cache            Do not use cache when building the image
+      --no-console          Use non-console progress UI
+  -o, --output string       BuildKit output specification (e.g. type=tar,dest=build.tar)
+      --platform list       Set platforms for which the image should be built
+  -t, --tag list            Name and optionally a tag in the 'name:tag' format
+      --target string       Set the target build stage to build
 
 Global Flags:
   -b, --backend string   backend for snapshots ([auto native overlayfs]) (default "auto")

build.go

@@ -6,6 +6,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"context"
+	"encoding/json"
 	"errors"
 
 	"fmt"
@@ -26,6 +27,7 @@ import (
 	controlapi "github.com/moby/buildkit/api/services/control"
 	bkclient "github.com/moby/buildkit/client"
 	"github.com/moby/buildkit/cmd/buildctl/build"
+	bkbuild "github.com/moby/buildkit/cmd/buildctl/build"
 	"github.com/moby/buildkit/identity"
 	"github.com/moby/buildkit/session"
 	"github.com/moby/buildkit/session/filesync"
@@ -41,11 +43,13 @@ const buildUsageLongHelp = `Build an image from a Dockerfile`
 func newBuildCommand() *cobra.Command {
 
 	build := &buildCommand{
-		tags:      newListValue().WithValidator(validateTag),
-		buildArgs: newListValue(),
-		labels:    newListValue(),
-		platforms: newListValue(),
-		cacheFrom: newListValue(),
+		tags:        newListValue().WithValidator(validateTag),
+		buildArgs:   newListValue(),
+		labels:      newListValue(),
+		platforms:   newListValue(),
+		cacheFrom:   newListValue(),
+		exportCache: newListValue(),
+		importCache: newListValue(),
 	}
 
 	cmd := &cobra.Command{
@@ -72,6 +76,8 @@ func newBuildCommand() *cobra.Command {
 	fs.BoolVar(&build.noCache, "no-cache", false, "Do not use cache when building the image")
 	fs.StringVarP(&build.output, "output", "o", "", "BuildKit output specification (e.g. type=tar,dest=build.tar)")
 	fs.Var(build.cacheFrom, "cache-from", "Images to consider as cache sources")
+	fs.Var(build.exportCache, "export-cache", "Image cache export location (synonymous to buildkit export-cache)")
+	fs.Var(build.importCache, "import-cache", "Image cache import location (synonymous to buildkit import-cache) takes precedence over 'cache-from'")
 	return cmd
 }
 
@@ -84,6 +90,8 @@ type buildCommand struct {
 	platforms      *listValue
 	output         string
 	cacheFrom      *listValue
+	exportCache    *listValue
+	importCache    *listValue
 	bkoutput       bkclient.ExportEntry
 
 	contextDir string
@@ -259,11 +267,39 @@ func (cmd *buildCommand) Run(args []string) (err error) {
 	})
 
 	var cacheExports []*controlapi.CacheOptionsEntry
-	cacheExports = append(cacheExports, &controlapi.CacheOptionsEntry{
-		Type: "inline",
-	})
+	if cmdExportCaches := cmd.exportCache.GetAll(); len(cmdExportCaches) > 0 {
+		parsedCacheExports, err := bkbuild.ParseExportCache(cmdExportCaches, []string{})
+		if err != nil {
+			return fmt.Errorf("error parsing export cache: %v", err)
+		}
+
+		for _, exportCacheItem := range parsedCacheExports {
+			cacheExports = append(cacheExports, &controlapi.CacheOptionsEntry{
+				Type:  exportCacheItem.Type,
+				Attrs: exportCacheItem.Attrs,
+			})
+		}
+	} else {
+		cacheExports = append(cacheExports, &controlapi.CacheOptionsEntry{
+			Type: "inline",
+		})
+	}
 
 	var cacheImports []*controlapi.CacheOptionsEntry
+	if cmdImportCaches := cmd.importCache.GetAll(); len(cmdImportCaches) > 0 {
+		parsedCacheImport, err := bkbuild.ParseImportCache(cmdImportCaches)
+		if err != nil {
+			return fmt.Errorf("error parsing import cache: %v", err)
+		}
+
+		for _, importCacheItem := range parsedCacheImport {
+			cacheImports = append(cacheImports, &controlapi.CacheOptionsEntry{
+				Type:  importCacheItem.Type,
+				Attrs: importCacheItem.Attrs,
+			})
+		}
+	}
+
 	for _, cacheTarget := range cmd.cacheFrom.GetAll() {
 		cacheImports = append(cacheImports, &controlapi.CacheOptionsEntry{
 			Type: "registry",
@@ -277,6 +313,14 @@ func (cmd *buildCommand) Run(args []string) (err error) {
 		frontendAttrs["cache-from"] = strings.Join(cmd.cacheFrom.GetAll(), ",")
 	}
 
+	if len(cacheImports) > 0 {
+		cacheImportMarshalled, err := json.Marshal(cacheImports)
+		if err != nil {
+			return fmt.Errorf("failed to marshal cache-imports: %v", err)
+		}
+		frontendAttrs["cache-imports"] = string(cacheImportMarshalled)
+	}
+
 	// Solve the dockerfile.
 	eg.Go(func() error {
 		defer sess.Close()

client/controller.go

@@ -2,9 +2,12 @@ package client
 
 import (
 	"fmt"
+	"path/filepath"
+
 	"github.com/containerd/containerd/remotes/docker"
 	"github.com/moby/buildkit/cache/remotecache"
 	inlineremotecache "github.com/moby/buildkit/cache/remotecache/inline"
+	localremotecache "github.com/moby/buildkit/cache/remotecache/local"
 	registryremotecache "github.com/moby/buildkit/cache/remotecache/registry"
 	"github.com/moby/buildkit/control"
 	"github.com/moby/buildkit/frontend"
@@ -14,7 +17,6 @@ import (
 	"github.com/moby/buildkit/solver/bboltcachestorage"
 	"github.com/moby/buildkit/worker"
 	"github.com/moby/buildkit/worker/base"
-	"path/filepath"
 )
 
 func (c *Client) createController() error {
@@ -52,9 +54,12 @@ func (c *Client) createController() error {
 	}
 
 	remoteCacheExporterFuncs := map[string]remotecache.ResolveCacheExporterFunc{
-		"inline": inlineremotecache.ResolveCacheExporterFunc(),
+		"inline":   inlineremotecache.ResolveCacheExporterFunc(),
+		"local":    localremotecache.ResolveCacheExporterFunc(sm),
+		"registry": registryremotecache.ResolveCacheExporterFunc(sm, docker.ConfigureDefaultRegistries()),
 	}
 	remoteCacheImporterFuncs := map[string]remotecache.ResolveCacheImporterFunc{
+		"local":    localremotecache.ResolveCacheImporterFunc(sm),
 		"registry": registryremotecache.ResolveCacheImporterFunc(sm, opt.ContentStore, docker.ConfigureDefaultRegistries()),
 	}
 
@@ -66,7 +71,6 @@ func (c *Client) createController() error {
 		ResolveCacheExporterFuncs: remoteCacheExporterFuncs,
 		ResolveCacheImporterFuncs: remoteCacheImporterFuncs,
 		CacheKeyStorage:           cacheStorage,
-		// No cache importer/exporter
 	})
 	if err != nil {
 		return fmt.Errorf("creating new controller failed: %v", err)

go.mod

@@ -18,7 +18,7 @@ require (
 	github.com/docker/go-units v0.4.0
 	github.com/genuinetools/reg v0.16.0
 	github.com/mitchellh/hashstructure v1.0.0 // indirect
-	github.com/moby/buildkit v0.7.1
+	github.com/moby/buildkit v0.7.2
 	github.com/opencontainers/image-spec v1.0.1
 	github.com/opencontainers/runc v1.0.0-rc9.0.20200221051241-688cf6d43cc4
 	github.com/opentracing-contrib/go-stdlib v0.0.0-20180702182724-07a764486eb1 // indirect

go.sum

@@ -221,6 +221,8 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
 github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f/go.mod h1:OkQIRizQZAeMln+1tSwduZz7+Af5oFlKirV/MSYes2A=
 github.com/moby/buildkit v0.7.1 h1:aPnJdFwfTVuV/+MpOiBu0rTWi0FnRoUYX/WI+8ZJQeU=
 github.com/moby/buildkit v0.7.1/go.mod h1:D3DN/Nl4DyMH1LkwpRUJuoghqdigdXd1A6HXt5aZS40=
+github.com/moby/buildkit v0.7.2 h1:wp4R0QMXSqwjTJKhhWlJNOCSQ/OVPnsCf3N8rs09+vQ=
+github.com/moby/buildkit v0.7.2/go.mod h1:D3DN/Nl4DyMH1LkwpRUJuoghqdigdXd1A6HXt5aZS40=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c h1:nXxl5PrvVm2L/wCy8dQu6DMTwH4oIuGN8GJDAlqDdVE=
 github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=