fix(create-bucket): set BUCKET_NAME for swift

Matthew Fisher · Matthew Fisher · commit 5aafbac11dd1 · 2017-01-06T11:14:51.000-08:00
diff --git a/main.go b/main.go
@@ -136,6 +136,7 @@ func main() {
 			log.Fatal(err)
 		} else {
 			os.Setenv("REGISTRY_STORAGE_SWIFT_CONTAINER", string(container))
+			os.Setenv("BUCKET_NAME", string(container))
 		}
 
 		if authVersion, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/authversion"); err != nil {
diff --git a/rootfs/bin/create-bucket b/rootfs/bin/create-bucket
@@ -53,7 +53,7 @@ elif os.getenv('REGISTRY_STORAGE') == "swift":
         tenant_name=os.getenv('REGISTRY_STORAGE_SWIFT_TENANT')
     )
     # swift also does not throw exception if container already exists.
-    conn.put_container(os.getenv('BUCKET_NAME'))
+    conn.put_container(bucket_name)
 
 elif os.getenv('REGISTRY_STORAGE') == "s3" and os.getenv('REGISTRY_STORAGE_S3_BACKEND') == 'minio':
     botoconfig.add_section('s3')

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ func main() {`
`136`	`136`	`log.Fatal(err)`
`137`	`137`	`} else {`
`138`	`138`	`os.Setenv("REGISTRY_STORAGE_SWIFT_CONTAINER", string(container))`
	`139`	`+ os.Setenv("BUCKET_NAME", string(container))`
`139`	`140`	`}`
`140`	`141`
`141`	`142`	`if authVersion, err := ioutil.ReadFile("/var/run/secrets/deis/registry/creds/authversion"); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ elif os.getenv('REGISTRY_STORAGE') == "swift":`
`53`	`53`	`tenant_name=os.getenv('REGISTRY_STORAGE_SWIFT_TENANT')`
`54`	`54`	`)`
`55`	`55`	`# swift also does not throw exception if container already exists.`
`56`		`- conn.put_container(os.getenv('BUCKET_NAME'))`
	`56`	`+ conn.put_container(bucket_name)`
`57`	`57`
`58`	`58`	`elif os.getenv('REGISTRY_STORAGE') == "s3" and os.getenv('REGISTRY_STORAGE_S3_BACKEND') == 'minio':`
`59`	`59`	`botoconfig.add_section('s3')`