Merge pull request #13428 from aweiteka/schema2

smarterclayton · web-flow · commit a3e682000068 · 2017-06-16T00:32:57.000-04:00
enable registry middleware acceptschema2
diff --git a/images/dockerregistry/config.yml b/images/dockerregistry/config.yml
@@ -27,7 +27,7 @@ middleware:
   repository:
     - name: openshift
       options:
-        acceptschema2: false
+        acceptschema2: true
         pullthrough: true
         mirrorpullthrough: true
         enforcequota: false
diff --git a/pkg/dockerregistry/server/repositorymiddleware.go b/pkg/dockerregistry/server/repositorymiddleware.go
@@ -170,7 +170,7 @@ func newRepositoryWithClient(
 		return nil, fmt.Errorf("%s is required", DockerRegistryURLEnvVar)
 	}
 
-	acceptschema2, err := getBoolOption(AcceptSchema2EnvVar, "acceptschema2", false, options)
+	acceptschema2, err := getBoolOption(AcceptSchema2EnvVar, "acceptschema2", true, options)
 	if err != nil {
 		context.GetLogger(ctx).Error(err)
 	}
diff --git a/test/integration/dockerregistry_pullthrough_test.go b/test/integration/dockerregistry_pullthrough_test.go
@@ -53,7 +53,7 @@ middleware:
   repository:
     - name: openshift
       options:
-        acceptschema2: false
+        acceptschema2: true
         pullthrough: true
         enforcequota: false
         projectcachettl: 1m

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func newRepositoryWithClient(`
`170`	`170`	`return nil, fmt.Errorf("%s is required", DockerRegistryURLEnvVar)`
`171`	`171`	`}`
`172`	`172`
`173`		`- acceptschema2, err := getBoolOption(AcceptSchema2EnvVar, "acceptschema2", false, options)`
	`173`	`+ acceptschema2, err := getBoolOption(AcceptSchema2EnvVar, "acceptschema2", true, options)`
`174`	`174`	`if err != nil {`
`175`	`175`	`context.GetLogger(ctx).Error(err)`
`176`	`176`	`}`