File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -64,11 +64,8 @@ func main() {
6464 os .Exit (1 )
6565 }
6666 var storageDriver storagedriver.StorageDriver
67- if cnf .StorageType == "minio" {
68- storageDriver , err = factory .Create ("s3" , storageParams )
69- } else {
70- storageDriver , err = factory .Create (cnf .StorageType , storageParams )
71- }
67+ storageDriver , err = factory .Create ("s3" , storageParams )
68+
7269 if err != nil {
7370 log .Printf ("Error creating storage driver (%s)" , err )
7471 os .Exit (1 )
@@ -132,11 +129,8 @@ func main() {
132129 os .Exit (1 )
133130 }
134131 var storageDriver storagedriver.StorageDriver
135- if cnf .StorageType == "minio" {
136- storageDriver , err = factory .Create ("s3" , storageParams )
137- } else {
138- storageDriver , err = factory .Create (cnf .StorageType , storageParams )
139- }
132+ storageDriver , err = factory .Create ("s3" , storageParams )
133+
140134 if err != nil {
141135 log .Printf ("Error creating storage driver (%s)" , err )
142136 os .Exit (1 )
Original file line number Diff line number Diff line change @@ -55,15 +55,10 @@ func GetStorageParams(env sys.Env) (Parameters, error) {
5555 }
5656 }
5757 params ["bucket" ] = params ["builder-bucket" ]
58- params ["container" ] = params ["builder-container" ]
59- if env .Get ("BUILDER_STORAGE" ) == "minio" {
60- mHost := env .Get (minioHostEnvVar )
61- mPort := env .Get (minioPortEnvVar )
62- params ["regionendpoint" ] = fmt .Sprintf ("http://%s:%s" , mHost , mPort )
63- params ["secure" ] = false
64- params ["region" ] = "us-east-1"
65- params ["bucket" ] = "git"
66- }
67-
58+ mHost := env .Get (minioHostEnvVar )
59+ mPort := env .Get (minioPortEnvVar )
60+ params ["region" ] = "us-east-1"
61+ params ["regionendpoint" ] = fmt .Sprintf ("http://%s:%s" , mHost , mPort )
62+ params ["secure" ] = false
6863 return params , nil
6964}
You can’t perform that action at this time.
0 commit comments