feat: set mirrors from concourse request

Author: jmccann

buildkitd.go

@@ -19,18 +19,18 @@ import (
 type Buildkitd struct {
 	Addr string
 
+	config  *BuildkitdConfig
 	rootDir string
 	opts    *BuildkitdOpts
 	proc    *os.Process
 }
 
 // BuildkitdOpts to provide to Buildkitd
 type BuildkitdOpts struct {
-	Config     *BuildkitdConfig
 	ConfigPath string
 }
 
-func SpawnBuildkitd(opts *BuildkitdOpts) (*Buildkitd, error) {
+func SpawnBuildkitd(req Request, opts *BuildkitdOpts) (*Buildkitd, error) {
 	buildkitd := Buildkitd{}
 	if opts != nil {
 		buildkitd.opts = opts
@@ -41,6 +41,8 @@ func SpawnBuildkitd(opts *BuildkitdOpts) (*Buildkitd, error) {
 		return nil, errors.Wrap(err, "setup cgroups")
 	}
 
+	buildkitd.setConfigFromRequest(req)
+
 	err = buildkitd.generateConfig()
 	if err != nil {
 		return nil, errors.Wrap(err, "generate config")
@@ -136,12 +138,32 @@ func (buildkitd *Buildkitd) Cleanup() error {
 	return nil
 }
 
+func (buildkitd *Buildkitd) setConfigFromRequest(req Request) {
+	var config BuildkitdConfig
+	var configSet bool
+
+	if len(req.Config.Mirrors) > 0 {
+		var registryConfigs map[string]RegistryConfig
+		registryConfigs = make(map[string]RegistryConfig)
+		registryConfigs["docker.io"] = RegistryConfig{
+			Mirrors: req.Config.Mirrors,
+		}
+
+		config.Registries = registryConfigs
+		configSet = true
+	}
+
+	if configSet {
+		buildkitd.config = &config
+	}
+}
+
 func (buildkitd Buildkitd) generateConfig() error {
-	if buildkitd.opts == nil || buildkitd.opts.Config == nil {
+	if buildkitd.config == nil {
 		return nil
 	}
 
-	if buildkitd.opts.ConfigPath == "" {
+	if buildkitd.opts == nil || buildkitd.opts.ConfigPath == "" {
 		buildkitd.opts.ConfigPath = "/etc/buildkit/buildkitd.toml"
 	}
 
@@ -158,7 +180,7 @@ func (buildkitd Buildkitd) generateConfig() error {
 		return err
 	}
 
-	err = toml.NewEncoder(f).Encode(buildkitd.opts.Config)
+	err = toml.NewEncoder(f).Encode(buildkitd.config)
 	if err != nil {
 		return err
 	}

buildkitd_test.go

@@ -55,25 +55,9 @@ func (s *BuildkitdSuite) TestNoConfig() {
 func (s *BuildkitdSuite) TestGenerateConfig() {
 	var err error
 
-	var registryConfigs map[string]task.RegistryConfig
-	registryConfigs = make(map[string]task.RegistryConfig)
-	registryConfigs["docker.io"] = task.RegistryConfig{
-		Mirrors:   []string{"hub.docker.io"},
-		PlainHTTP: &[]bool{true}[0],
-		Insecure:  &[]bool{true}[0],
-		RootCAs:   []string{"/etc/config/myca.pem"},
-		KeyPairs: []task.TLSKeyPair{
-			{
-				Key:         "/etc/config/key.pem",
-				Certificate: "/etc/config/cert.pem",
-			},
-		},
-	}
+	s.req.Config.Mirrors = []string{"hub.docker.io"}
 
-	s.buildkitd, err = task.SpawnBuildkitd(&task.BuildkitdOpts{
-		Config: &task.BuildkitdConfig{
-			Registries: registryConfigs,
-		},
+	s.buildkitd, err = task.SpawnBuildkitd(s.req, &task.BuildkitdOpts{
 		ConfigPath: s.configPath("mirrors.toml"),
 	})
 	s.NoError(err)

cmd/task/main.go

@@ -29,7 +29,7 @@ func main() {
 		}
 	}
 
-	buildkitd, err := task.SpawnBuildkitd(nil)
+	buildkitd, err := task.SpawnBuildkitd(req, nil)
 	failIf("start buildkitd", err)
 
 	res, err := task.Build(buildkitd, wd, req)

task_test.go

@@ -24,7 +24,7 @@ type TaskSuite struct {
 
 func (s *TaskSuite) SetupSuite() {
 	var err error
-	s.buildkitd, err = task.SpawnBuildkitd(nil)
+	s.buildkitd, err = task.SpawnBuildkitd(s.req, nil)
 	s.NoError(err)
 }
 

testdata/buildkitd-config/mirrors.toml

@@ -1,10 +1,3 @@
 [registry]
   [registry."docker.io"]
     mirrors = ["hub.docker.io"]
-    http = true
-    insecure = true
-    ca = ["/etc/config/myca.pem"]
-
-    [[registry."docker.io".keypair]]
-      key = "/etc/config/key.pem"
-      cert = "/etc/config/cert.pem"

types.go

@@ -55,6 +55,8 @@ type Config struct {
 	BuildArgs     []string `json:"build_args"      envconfig:"optional"`
 	BuildArgsFile string   `json:"build_args_file" envconfig:"optional"`
 
+	Mirrors []string `json:"mirrors" envconfig:"optional"`
+
 	// Unpack the OCI image into Concourse's rootfs/ + metadata.json image scheme.
 	//
 	// Theoretically this would go away if/when we standardize on OCI.