envd 0.3.30__tar.gz → 0.3.32__tar.gz

envd-0.3.32/.GIT_TAG_INFO

@@ -0,0 +1 @@
+v0.3.32

{envd-0.3.30 → envd-0.3.32}/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v0.3.31 (2023-07-04)
+
+ * [67ce1d7](https://github.com/tensorchord/envd/commit/67ce1d7cd5c234a59294a4bba02df35fa190bb2b) fix: mount buildkitd toml file (#1686)
+ * [cde4632](https://github.com/tensorchord/envd/commit/cde4632b2954b510e72efe2a7373d2c1d37456e9) support using json for registry config (#1680)
+ * [b5f9a49](https://github.com/tensorchord/envd/commit/b5f9a49d911ce5ee1e8859968f449835d4147c5f) Fix PATH Order (#1679)
+
+### Contributors
+
+ * Keming
+ * Richard Li
+
+## v0.3.30 (2023-06-29)
+
+
+### Contributors
+
+
 ## v0.3.29 (2023-06-29)
 
 

{envd-0.3.30 → envd-0.3.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envd
-Version: 0.3.30
+Version: 0.3.32
 Summary: A development environment management tool for data scientists.
 Home-page: https://github.com/tensorchord/envd
 Author: TensorChord

{envd-0.3.30 → envd-0.3.32}/envd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: envd
-Version: 0.3.30
+Version: 0.3.32
 Summary: A development environment management tool for data scientists.
 Home-page: https://github.com/tensorchord/envd
 Author: TensorChord

{envd-0.3.30 → envd-0.3.32}/pkg/app/bootstrap.go

@@ -15,6 +15,7 @@
 package app
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -47,12 +48,12 @@ var CommandBootstrap = &cli.Command{
 		},
 		&cli.BoolFlag{
 			Name:  "with-autocomplete",
-			Usage: "Add envd autocompletions",
+			Usage: "Add envd auto-completions",
 			Value: true,
 		},
 		&cli.StringFlag{
 			Name:    "dockerhub-mirror",
-			Usage:   "Dockerhub mirror to use",
+			Usage:   "DockerHub mirror to use",
 			Aliases: []string{"m"},
 		},
 		&cli.StringFlag{
@@ -62,7 +63,7 @@ var CommandBootstrap = &cli.Command{
 		},
 		&cli.StringSliceFlag{
 			Name: "ssh-keypair",
-			Usage: fmt.Sprintf("Manually specify ssh key pair as `publicKey,privateKey`. Envd will generate a keypair at %s and %s if not specified",
+			Usage: fmt.Sprintf("Manually specify ssh key pair as `publicKey,privateKey`. envd will generate a keypair at %s and %s if not specified",
 				sshconfig.GetPublicKeyOrPanic(), sshconfig.GetPrivateKeyOrPanic()),
 			Aliases: []string{"k"},
 		},
@@ -75,6 +76,11 @@ var CommandBootstrap = &cli.Command{
 			Name:    "registry",
 			Usage:   "Specify the registry to pull the image from",
 			Aliases: []string{"r"},
+			Value:   "docker.io",
+		},
+		&cli.StringFlag{
+			Name:  "registry-config",
+			Usage: "Path to a JSON file containing registry configuration. Cannot be used with 'registry' or 'registry-ca-keypair'",
 		},
 	},
 
@@ -91,6 +97,9 @@ func bootstrap(clicontext *cli.Context) error {
 	}, {
 		"registry CA keypair",
 		registryCA,
+	}, {
+		"registry json config",
+		registryJSONConfig,
 	}, {
 		"autocomplete",
 		autocomplete,
@@ -112,16 +121,25 @@ func bootstrap(clicontext *cli.Context) error {
 }
 
 func registryCA(clicontext *cli.Context) error {
+	configFile := clicontext.String("registry-config")
 	ca := clicontext.String("registry-ca-keypair")
+	registry := clicontext.String("registry")
+
 	if len(ca) == 0 {
 		return nil
 	}
+
+	// We only need this check in registryCA because it is called before registryJSONConfig
+	if len(configFile) > 0 && len(ca) > 0 {
+		return errors.New("only one of `registry-config` and `registry-ca-keypair` can be used")
+	}
+
 	mirror := clicontext.String("dockerhub-mirror")
 	if len(mirror) == 0 {
 		return errors.New("`registry-ca-keypair` should be used with `dockerhub-mirror`")
 	}
 
-	// parse ca/key/cert
+	// Parse ca/key/cert
 	kvPairs := strings.Split(ca, ",")
 	if len(kvPairs) != 3 {
 		return errors.New("`registry-ca-keypair` requires ca/key/cert 3 part separated by ','")
@@ -146,7 +164,8 @@ func registryCA(clicontext *cli.Context) error {
 		if !exist {
 			return errors.Newf("file %s doesn't exist", kv[1])
 		}
-		path, err := fileutil.ConfigFile(fmt.Sprintf("registry_%s.pem", kv[0]))
+
+		path, err := fileutil.ConfigFile(fmt.Sprintf("%s_%s.pem", registry, kv[0]))
 		if err != nil {
 			return errors.Wrap(err, "failed to get the envd config file path")
 		}
@@ -166,6 +185,69 @@ func registryCA(clicontext *cli.Context) error {
 	return nil
 }
 
+func registryJSONConfig(clicontext *cli.Context) error {
+	configFile := clicontext.String("registry-config")
+	if len(configFile) == 0 {
+		return nil
+	}
+
+	// Check if file exists
+	exist, err := fileutil.FileExists(configFile)
+	if err != nil {
+		return errors.Wrap(err, fmt.Sprintf("failed to parse file path %s", configFile))
+	}
+	if !exist {
+		return errors.Newf("file %s doesn't exist", configFile)
+	}
+
+	config := buildkitutil.BuildkitConfig{}
+	configJson, err := os.ReadFile(configFile)
+	if err != nil {
+		return errors.Wrap(err, "Failed to read registry config file")
+	}
+	if err := json.Unmarshal(configJson, &config); err != nil {
+		return errors.Wrap(err, "Failed to parse registry config file")
+	}
+
+	// Check for required keys in each registry
+	for i, registry := range config.Registries {
+		if registry.Name == "" {
+			return errors.Newf("`name` key is required in the config for registry at index %d", i)
+		}
+
+		// Check for optional keys and if they exist, ensure they point to existing files
+		optionalKeys := map[string]string{"ca": registry.Ca, "cert": registry.Cert, "key": registry.Key}
+		for key, value := range optionalKeys {
+			if value != "" {
+				exist, err := fileutil.FileExists(value)
+				if err != nil {
+					return errors.Wrap(err, fmt.Sprintf("failed to parse file path %s", value))
+				}
+				if !exist {
+					return errors.Newf("file %s doesn't exist", value)
+				}
+
+				// Read the file
+				content, err := os.ReadFile(value)
+				if err != nil {
+					return errors.Wrap(err, fmt.Sprintf("failed to read the %s file for registry %s", key, registry.Name))
+				}
+
+				// Write the content to the envd config directory
+				envdConfigPath, err := fileutil.ConfigFile(fmt.Sprintf("%s_%s.pem", registry.Name, key))
+				if err != nil {
+					return errors.Wrap(err, fmt.Sprintf("failed to get the envd config file path for %s of registry %s", key, registry.Name))
+				}
+
+				if err = os.WriteFile(envdConfigPath, content, 0644); err != nil {
+					return errors.Wrap(err, fmt.Sprintf("failed to store the %s file for registry %s", key, registry.Name))
+				}
+			}
+		}
+	}
+	return nil
+}
+
 func sshKey(clicontext *cli.Context) error {
 	sshKeyPair := clicontext.StringSlice("ssh-keypair")
 
@@ -240,7 +322,7 @@ func sshKey(clicontext *cli.Context) error {
 		return nil
 
 	default:
-		return errors.Errorf("Invalid ssh-keypair flag")
+		return errors.Newf("Invalid ssh-keypair flag")
 	}
 }
 
@@ -289,14 +371,39 @@ func buildkit(clicontext *cli.Context) error {
 	}
 
 	logrus.Debug("bootstrap the buildkitd container")
-	var bkClient buildkitd.Client
-	config := buildkitutil.BuildkitConfig{
-		Registry: clicontext.String("registry"),
-		Mirror:   clicontext.String("dockerhub-mirror"),
-		UseHTTP:  clicontext.Bool("use-http"),
-		SetCA:    clicontext.IsSet("registry-ca-keypair"),
+	// Populate the BuildkitConfig struct
+	config := buildkitutil.BuildkitConfig{}
+
+	configFile := clicontext.String("registry-config")
+	if len(configFile) != 0 {
+		configJson, err := os.ReadFile(configFile)
+		if err != nil {
+			return errors.Wrap(err, "Failed to read registry config file")
+		}
+		if err := json.Unmarshal(configJson, &config); err != nil {
+			return errors.Wrap(err, "Failed to parse registry config file")
+		}
+	} else if len(clicontext.String("registry-ca-keypair")) != 0 {
+		// The values of Ca, Cert, and Key don't actually matter since we already copied their contents to the envd config directory and mounted to `/etc/registry`.
+		// So instead of parsing registry-ca-keypair again, we'll just put the default value.
+		// This is to ensure that buildkitConfigTemplate parses properly.
+		config.Registries = append(config.Registries, buildkitutil.Registry{
+			Name:    clicontext.String("registry"),
+			Ca:      "/etc/registry",
+			Cert:    "/etc/registry",
+			Key:     "/etc/registry",
+			UseHTTP: clicontext.Bool("use-http"),
+			Mirror:  clicontext.String("dockerhub-mirror"),
+		})
+	} else if len(clicontext.String("dockerhub-mirror")) != 0 {
+		config.Registries = append(config.Registries, buildkitutil.Registry{
+			Name:    clicontext.String("registry"),
+			UseHTTP: clicontext.Bool("use-http"),
+			Mirror:  clicontext.String("dockerhub-mirror"),
+		})
 	}
 
+	var bkClient buildkitd.Client
 	if c.Builder == types.BuilderTypeMoby {
 		bkClient, err = buildkitd.NewMobyClient(clicontext.Context,
 			c.Builder, c.BuilderAddress, &config)

{envd-0.3.30 → envd-0.3.32}/pkg/app/build.go

@@ -83,12 +83,12 @@ To build and push the image to a registry:
 		// https://github.com/urfave/cli/issues/1134#issuecomment-1191407527
 		&cli.StringFlag{
 			Name:    "export-cache",
-			Usage:   "Export the cache (e.g. type=registry,ref=<image>)",
+			Usage:   "Export the cache (e.g. `type=registry,ref=<image>`)",
 			Aliases: []string{"ec"},
 		},
 		&cli.StringFlag{
 			Name:    "import-cache",
-			Usage:   "Import the cache (e.g. type=registry,ref=<image>)",
+			Usage:   "Import the cache (e.g. `type=registry,ref=<image>`)",
 			Aliases: []string{"ic"},
 		},
 		&cli.StringFlag{

{envd-0.3.30 → envd-0.3.32}/pkg/app/run.go

@@ -80,7 +80,7 @@ var CommandCreate = &cli.Command{
 		},
 		&cli.StringFlag{
 			Name:  "host",
-			Usage: "Assign the host address for environment ssh acesss server listening",
+			Usage: "Assign the host address for the environment SSH access server listening",
 			Value: envd.Localhost,
 		},
 		&cli.IntFlag{

{envd-0.3.30 → envd-0.3.32}/pkg/app/up.go

@@ -128,18 +128,18 @@ var CommandUp = &cli.Command{
 		},
 		&cli.StringFlag{
 			Name:  "host",
-			Usage: "Assign the host address for environment ssh acesss server listening",
+			Usage: "Assign the host address for the environment SSH access server listening",
 			Value: envd.Localhost,
 		},
 		// https://github.com/urfave/cli/issues/1134#issuecomment-1191407527
 		&cli.StringFlag{
 			Name:    "export-cache",
-			Usage:   "Export the cache (e.g. type=registry,ref=<image>)",
+			Usage:   "Export the cache (e.g. `type=registry,ref=<image>`)",
 			Aliases: []string{"ec"},
 		},
 		&cli.StringFlag{
 			Name:    "import-cache",
-			Usage:   "Import the cache (e.g. type=registry,ref=<image>)",
+			Usage:   "Import the cache (e.g. `type=registry,ref=<image>`)",
 			Aliases: []string{"ic"},
 		},
 		&cli.StringFlag{

{envd-0.3.30 → envd-0.3.32}/pkg/driver/docker/docker.go

@@ -17,9 +17,9 @@ package docker
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"regexp"
 	"strconv"
 	"strings"
@@ -40,7 +40,7 @@ import (
 	"github.com/tensorchord/envd/pkg/util/fileutil"
 )
 
-const buildkitdCertPath = "/etc/registry"
+const buildkitdConfigPath = "/etc/registry"
 
 var (
 	anchoredIdentifierRegexp = regexp.MustCompile(`^([a-f0-9]{64})$`)
@@ -205,25 +205,22 @@ func (c dockerClient) StartBuildkitd(ctx context.Context, tag, name string, bc *
 	hostConfig := &container.HostConfig{
 		Privileged: true,
 		AutoRemove: true,
+		Mounts: []mount.Mount{
+			{
+				Type:   mount.TypeBind,
+				Source: fileutil.DefaultConfigDir,
+				Target: buildkitdConfigPath,
+			},
+		},
 	}
 
-	if bc.SetCA {
-		hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
-			Type:   mount.TypeBind,
-			Source: fileutil.DefaultConfigDir,
-			Target: buildkitdCertPath,
-		})
-	}
-	cfg, err := bc.String()
+	err := bc.Save()
 	if err != nil {
 		return "", errors.Wrap(err, "failed to generate buildkit config")
 	}
 	config.Entrypoint = []string{
-		"/bin/sh",
-		"-c",
-		fmt.Sprintf("mkdir /etc/buildkit && echo '%s' > /etc/buildkit/buildkitd.toml && buildkitd", cfg),
+		"buildkitd", "--config", filepath.Join(buildkitdConfigPath, "buildkitd.toml"),
 	}
-	logger.Debugf("setting buildkit config: %s", cfg)
 	created, _ := c.Exists(ctx, name)
 	if created {
 		err := c.ContainerStart(ctx, name, types.ContainerStartOptions{})

{envd-0.3.30 → envd-0.3.32}/pkg/driver/nerdctl/nerdctl.go

@@ -83,7 +83,7 @@ func (nc *nerdctlClient) StartBuildkitd(ctx context.Context, tag, name string, b
 	if !existed {
 		buildkitdCmd := "buildkitd"
 		// TODO: support mirror CA keypair
-		if bc.Registry != "" || bc.Mirror != "" || bc.UseHTTP {
+		if len(bc.Registries) > 0 {
 			cfg, err := bc.String()
 			if err != nil {
 				return "", errors.Wrap(err, "failed to generate buildkit config")

{envd-0.3.30 → envd-0.3.32}/pkg/lang/ir/v1/system.go

@@ -353,15 +353,20 @@ func (g *generalGraph) compileBaseImage() (llb.State, error) {
 			// 1. configured paths in the Starlark frontend `runtime.environ(extra_path=[...])`
 			// 2. paths in the base image
 			// 3. others added during the image building (Python paths, etc.)
-			extraPaths := make(map[string]bool)
-			for _, path := range strings.Split(kv[1], ":") {
-				extraPaths[path] = true
-			}
+
+			// iterate over the original paths and add them to the map
+			pathMap := make(map[string]bool)
 			for _, path := range g.RuntimeEnvPaths {
-				extraPaths[path] = false
+				pathMap[path] = true
 			}
-			for path, required := range extraPaths {
-				if required {
+			// split the PATH into different paths
+			newPaths := strings.Split(kv[1], ":")
+			// iterate over the new paths
+			for _, path := range newPaths {
+				// check if the path is already in the map
+				if _, ok := pathMap[path]; !ok {
+					// if not, add the path to the map and slice
+					pathMap[path] = true
 					g.RuntimeEnvPaths = append(g.RuntimeEnvPaths, path)
 				}
 			}

envd-0.3.32/pkg/util/buildkitutil/buildkit.go

@@ -0,0 +1,83 @@
+// Copyright 2023 The envd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package buildkitutil
+
+import (
+	"os"
+	"strings"
+	"text/template"
+
+	"github.com/cockroachdb/errors"
+
+	"github.com/tensorchord/envd/pkg/util/fileutil"
+)
+
+const buildkitConfigTemplate = `
+[registry]
+{{- range $registry := .Registries }}
+  [registry."{{ if $registry.Name }}{{ $registry.Name }}{{ else }}docker.io{{ end }}"]
+    {{- if $registry.UseHTTP }}
+    http = true
+    {{- end }}
+    {{- if $registry.Mirror }}
+    mirrors = ["{{ $registry.Mirror }}"]
+    {{- end }}
+    {{- if $registry.Ca }}
+    ca=["/etc/registry/{{ $registry.Name }}_ca.pem"]
+    {{- end }}
+    {{- if and $registry.Cert $registry.Key }}
+    [[registry."{{ if $registry.Name }}{{ $registry.Name }}{{ else }}docker.io{{ end }}".keypair]]
+      key="/etc/registry/{{ $registry.Name }}_key.pem"
+      cert="/etc/registry/{{ $registry.Name }}_cert.pem"
+    {{- end }}
+{{- end }}
+`
+
+type Registry struct {
+	Name    string `json:"name"`
+	Ca      string `json:"ca"`
+	Cert    string `json:"cert"`
+	Key     string `json:"key"`
+	UseHTTP bool   `json:"use_http"`
+	Mirror  string `json:"mirror"`
+}
+
+type BuildkitConfig struct {
+	Registries []Registry `json:"registries"`
+}
+
+func (c *BuildkitConfig) String() (string, error) {
+	tmpl, err := template.New("buildkitConfig").Parse(buildkitConfigTemplate)
+	if err != nil {
+		return "", err
+	}
+	var config strings.Builder
+	err = tmpl.Execute(&config, c)
+	return config.String(), err
+}
+
+func (c *BuildkitConfig) Save() error {
+	text, err := c.String()
+	if err != nil {
+		return err
+	}
+
+	path, err := fileutil.ConfigFile("buildkitd.toml")
+	if err != nil {
+		return errors.Wrap(err, "failed to get the buildkitd config file")
+	}
+	err = os.WriteFile(path, []byte(text), 0644)
+	return err
+}

envd-0.3.32/pkg/util/buildkitutil/buildkit_test.go

@@ -0,0 +1,127 @@
+// Copyright 2023 The envd Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package buildkitutil
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBuildkitWithRegistry(t *testing.T) {
+	testCases := []struct {
+		bc       BuildkitConfig
+		expected string
+	}{
+		{
+			BuildkitConfig{
+				Registries: []Registry{
+					{
+						Name:    "registry.example.com",
+						Ca:      "/etc/registry/ca.pem",
+						Cert:    "/etc/registry/cert.pem",
+						Key:     "/etc/registry/key.pem",
+						UseHTTP: false,
+						Mirror:  "https://mirror.example.com",
+					},
+				},
+			},
+			`
+[registry]
+  [registry."registry.example.com"]
+    mirrors = ["https://mirror.example.com"]
+    ca=["/etc/registry/registry.example.com_ca.pem"]
+    [[registry."registry.example.com".keypair]]
+      key="/etc/registry/registry.example.com_key.pem"
+      cert="/etc/registry/registry.example.com_cert.pem"
+`,
+		},
+		{
+			BuildkitConfig{
+				Registries: []Registry{
+					{
+						Name:    "registry.example.com",
+						UseHTTP: true,
+						Mirror:  "https://mirror.example.com",
+					},
+					{
+						Name:   "docker.io",
+						Mirror: "https://mirror.example.com",
+					},
+				},
+			},
+			`
+[registry]
+  [registry."registry.example.com"]
+    http = true
+    mirrors = ["https://mirror.example.com"]
+  [registry."docker.io"]
+    mirrors = ["https://mirror.example.com"]
+`,
+		},
+		{
+			BuildkitConfig{
+				Registries: []Registry{},
+			},
+			`
+[registry]
+`,
+		},
+		{
+			BuildkitConfig{
+				Registries: []Registry{
+					{
+						Name:    "registry1.example.com",
+						Ca:      "/etc/registry/ca1.pem",
+						Cert:    "/etc/registry/cert1.pem",
+						Key:     "/etc/registry/key1.pem",
+						UseHTTP: true,
+						Mirror:  "https://mirror.example.com",
+					},
+					{
+						Name:   "registry2.example.com",
+						Ca:     "/etc/registry/ca2.pem",
+						Cert:   "/etc/registry/cert2.pem",
+						Key:    "/etc/registry/key2.pem",
+						Mirror: "https://mirror.example.com",
+					},
+				},
+			},
+			`
+[registry]
+  [registry."registry1.example.com"]
+    http = true
+    mirrors = ["https://mirror.example.com"]
+    ca=["/etc/registry/registry1.example.com_ca.pem"]
+    [[registry."registry1.example.com".keypair]]
+      key="/etc/registry/registry1.example.com_key.pem"
+      cert="/etc/registry/registry1.example.com_cert.pem"
+  [registry."registry2.example.com"]
+    mirrors = ["https://mirror.example.com"]
+    ca=["/etc/registry/registry2.example.com_ca.pem"]
+    [[registry."registry2.example.com".keypair]]
+      key="/etc/registry/registry2.example.com_key.pem"
+      cert="/etc/registry/registry2.example.com_cert.pem"
+`,
+		},
+	}
+
+	for _, tc := range testCases {
+		config, err := tc.bc.String()
+		assert.NoError(t, err)
+		assert.Equal(t, strings.TrimSpace(tc.expected), strings.TrimSpace(config))
+	}
+}

envd-0.3.30/.GIT_TAG_INFO

@@ -1 +0,0 @@
-v0.3.30

envd-0.3.30/pkg/util/buildkitutil/buildkit.go

@@ -1,48 +0,0 @@
-// Copyright 2023 The envd Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package buildkitutil
-
-import (
-	"strings"
-	"text/template"
-)
-
-const buildkitConfigTemplate = `
-[registry."{{ if .Registry }}{{ .Registry }}{{ else }}docker.io{{ end }}"]{{ if .Mirror }}
-  mirrors = ["{{ .Mirror }}"]{{ end }}
-  http = {{ .UseHTTP }}
-  {{ if .SetCA}}ca=["/etc/registry/ca.pem"]
-  [[registry."{{ if .Registry }}{{ .Registry }}{{ else }}docker.io{{ end }}".keypair]]
-	key="/etc/registry/key.pem"
-	cert="/etc/registry/cert.pem"
-  {{ end }}
-`
-
-type BuildkitConfig struct {
-	Registry string
-	Mirror   string
-	UseHTTP  bool
-	SetCA    bool
-}
-
-func (c *BuildkitConfig) String() (string, error) {
-	tmpl, err := template.New("buildkitConfig").Parse(buildkitConfigTemplate)
-	if err != nil {
-		return "", err
-	}
-	var config strings.Builder
-	err = tmpl.Execute(&config, c)
-	return config.String(), err
-}