Move defaults from config map to DockerRegistryClient (#178)

uber-archive · Feb 1, 2019 · 43f6006 · 43f6006
1 parent 1dac130
commit 43f6006
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/bin/makisu/cmd/pull.go b/bin/makisu/cmd/pull.go
@@ -29,9 +29,9 @@ type pullCmd struct {
 func getPullCmd() *pullCmd {
 	pullCmd := &pullCmd{
 		Command: &cobra.Command{
-			Use:                   "pull --dest <destination of rootfs> <image repository>",
+			Use: "pull --dest <destination of rootfs> <image repository>",
 			DisableFlagsInUseLine: true,
-			Short:                 "Pull docker image from registry into the storage directory of makisu.",
+			Short: "Pull docker image from registry into the storage directory of makisu.",
 		},
 	}
 	pullCmd.Args = func(cmd *cobra.Command, args []string) error {
@@ -61,7 +61,6 @@ func (cmd *pullCmd) Pull(repository string) {
 	registry.DefaultDockerHubConfiguration.Security.TLS.CA.Cert.Path = cmd.cacerts
 	registry.ConfigurationMap[image.DockerHubRegistry] = make(registry.RepositoryMap)
 	registry.ConfigurationMap[image.DockerHubRegistry]["library/*"] = registry.DefaultDockerHubConfiguration
-	registry.ConfigurationMap[image.DockerHubRegistry][".*"] = registry.DefaultDockerHubConfiguration
 
 	client := registry.New(store, cmd.registry, repository)
 	manifest, err := client.Pull(cmd.tag)

diff --git a/bin/makisu/cmd/utils.go b/bin/makisu/cmd/utils.go
@@ -42,8 +42,6 @@ import (
 
 func (cmd *buildCmd) initRegistryConfig() error {
 	if cmd.registryConfig == "" {
-		registry.ConfigurationMap[image.DockerHubRegistry] = make(registry.RepositoryMap)
-		registry.ConfigurationMap[image.DockerHubRegistry][".*"] = registry.DefaultDockerHubConfiguration
 		return nil
 	}
 

diff --git a/lib/registry/client.go b/lib/registry/client.go
@@ -82,6 +82,9 @@ func NewWithClient(store *storage.ImageStore, registry, repository string, clien
 
 func newClient(store *storage.ImageStore, registry, repository string, client *http.Client) *DockerRegistryClient {
 	config := Config{}
+	if registry == image.DockerHubRegistry {
+		config = DefaultDockerHubConfiguration
+	}
 	repoConfig, ok := ConfigurationMap[registry]
 	if ok {
 		for repo, c := range repoConfig {

diff --git a/lib/registry/config.go b/lib/registry/config.go
@@ -18,15 +18,12 @@ package registry
 import (
 	"time"
 
-	"github.com/uber/makisu/lib/docker/image"
 	"github.com/uber/makisu/lib/registry/security"
 	"github.com/uber/makisu/lib/utils/httputil"
 )
 
 // ConfigurationMap is a global variable that maps registry name to config.
-var ConfigurationMap = Map{
-	image.DockerHubRegistry: RepositoryMap{"library/*": DefaultDockerHubConfiguration},
-}
+var ConfigurationMap = Map{}
 
 // DefaultDockerHubConfiguration contains docker hub registry configuration.
 var DefaultDockerHubConfiguration = Config{

diff --git a/tools/bin/mkrootfs/main.go b/tools/bin/mkrootfs/main.go
@@ -26,7 +26,7 @@ var (
 
 func main() {
 	cmd := &cobra.Command{
-		Use:                   "--dest <destination of rootfs> <image repository>",
+		Use: "--dest <destination of rootfs> <image repository>",
 		DisableFlagsInUseLine: true,
 		Args: func(cmd *cobra.Command, args []string) error {
 			if len(args) != 1 {
@@ -58,7 +58,6 @@ func pullAndExtract(registryURL, repository, tag, destination string) {
 	registry.DefaultDockerHubConfiguration.Security.TLS.CA.Cert.Path = cacerts
 	registry.ConfigurationMap[image.DockerHubRegistry] = make(registry.RepositoryMap)
 	registry.ConfigurationMap[image.DockerHubRegistry]["library/*"] = registry.DefaultDockerHubConfiguration
-	registry.ConfigurationMap[image.DockerHubRegistry][".*"] = registry.DefaultDockerHubConfiguration
 
 	client := registry.New(store, registryURL, repository)
 	manifest, err := client.Pull(tag)