Use docker driver for storage layer

Author: Keerthan Mala

boot.go

@@ -13,10 +13,13 @@ import (
 	"github.com/deis/builder/pkg/gitreceive"
 	"github.com/deis/builder/pkg/healthsrv"
 	"github.com/deis/builder/pkg/sshd"
-	_ "github.com/deis/builder/pkg/storage/driver/azure"
-	"github.com/deis/builder/pkg/storage/driver/factory"
 	"github.com/deis/builder/pkg/sys"
 	pkglog "github.com/deis/pkg/log"
+	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	_ "github.com/docker/distribution/registry/storage/driver/azure"
+	"github.com/docker/distribution/registry/storage/driver/factory"
+	_ "github.com/docker/distribution/registry/storage/driver/gcs"
+	_ "github.com/docker/distribution/registry/storage/driver/s3-aws"
 	kcl "k8s.io/kubernetes/pkg/client/unversioned"
 )
 
@@ -60,7 +63,12 @@ func main() {
 					log.Printf("Error getting storage parameters (%s)", err)
 					os.Exit(1)
 				}
-				storageDriver, err := factory.Create(cnf.StorageType, storageParams)
+				var storageDriver storagedriver.StorageDriver
+				if cnf.StorageType == "minio" {
+					storageDriver, err = factory.Create("s3", storageParams)
+				} else {
+					storageDriver, err = factory.Create(cnf.StorageType, storageParams)
+				}
 				if err != nil {
 					log.Printf("Error creating storage driver (%s)", err)
 					os.Exit(1)
@@ -123,7 +131,12 @@ func main() {
 					log.Printf("Error getting storage parameters (%s)", err)
 					os.Exit(1)
 				}
-				storageDriver, err := factory.Create(cnf.StorageType, storageParams)
+				var storageDriver storagedriver.StorageDriver
+				if cnf.StorageType == "minio" {
+					storageDriver, err = factory.Create("s3", storageParams)
+				} else {
+					storageDriver, err = factory.Create(cnf.StorageType, storageParams)
+				}
 				if err != nil {
 					log.Printf("Error creating storage driver (%s)", err)
 					os.Exit(1)

glide.lock

@@ -1,65 +1,37 @@
 package: github.com/deis/builder
+ignore:
+- appengine
+- appengine/memcache
+- appengine/datastore
+- appengine/user
 import:
+- package: github.com/kelseyhightower/envconfig
+- package: github.com/gorilla/mux
+  version: e444e69cbd2e2e3e0749a2f3c717cec491552bbf
 - package: github.com/Masterminds/cookoo
+  version: 110a04ff7dc3e7c9b86c1a2413906a16a2bb65cb
   subpackages:
   - log
   - safely
-- package: github.com/aws/aws-sdk-go
-  version: 1.1.10
-  subpackages:
-  - aws
-  - aws/awserr
-  - aws/credentials
-  - aws/credentials/ec2rolecreds
-  - aws/ec2metadata
-  - aws/session
-  - service/s3
-- package: github.com/codegangsta/cli
-- package: github.com/deis/pkg
-  subpackages:
-  - log
-  - time
-- package: github.com/kelseyhightower/envconfig
-- package: github.com/pborman/uuid
+  - fmt
 - package: golang.org/x/crypto
+  version: f7445b17d61953e333441674c2d11e91ae4559d3
   subpackages:
   - ssh
-- package: golang.org/x/net
-  version: e7da8edaa52631091740908acaf2c2d4c9b3ce90
-  subpackages:
-  - context
-- package: golang.org/x/oauth2
-  version: 045497edb6234273d67dbc25da3f2ddbc4c4cacf
-  subpackages:
-  - google
-  - jwt
-- package: google.golang.org/api
-  version: e6294e63a06b2be522ff3d328d8cacded0b1bd31
-  subpackages:
-  - storage/v1
-- package: google.golang.org/cloud
-  version: e7549b8fad79f1f0b4cb2977d9acc45232a71894
-  subpackages:
-  - storage
 - package: gopkg.in/yaml.v2
-- package: k8s.io/kubernetes
-  subpackages:
-  - pkg/api
-  - pkg/api/errors
-  - pkg/client/unversioned
-  - pkg/fields
-  - pkg/labels
-  - pkg/util/wait
-  - pkg/watch
-- package: github.com/docker/docker
-  version: v1.9.0
-  subpackages:
-  - pkg/units
-- package: google.golang.org/grpc
-  version: 986912c9070a060e59e0f28ac7c87f89f72b9388
-  subpackages:
-  - credentials/oauth
-- package: github.com/Azure/azure-sdk-for-go
-  version: 95361a2573b1fa92a00c5fc2707a80308483c6f9
+  version: eca94c41d994ae2215d455ce578ae6e2dc6ee516
+- package: github.com/pborman/uuid
+- package: github.com/deis/pkg
+  version: b8679a4d7fe2fe0393c66c620eff7df86c9f7982
   subpackages:
-  - storage
+  - time
+  - log
+- package: github.com/codegangsta/cli
+  version: a65b733b303f0055f8d324d805f393cd3e7a7904
+- package: k8s.io/kubernetes
+  version: ~1.1
+- package: github.com/arschles/assert
+  version: 6882f85ccdc7c1822b146d1a6b0c2c48f91b5140
+- package: github.com/docker/distribution
+  repo: https://github.com/kmala/distribution
+  vcs: git

glide.yaml

@@ -15,7 +15,7 @@ const (
 	minioPortEnvVar     = "DEIS_MINIO_SERVICE_PORT"
 )
 
-type Parameters map[string]string
+type Parameters map[string]interface{}
 
 // EnvConfig is a convenience function to process the envconfig (
 // https://github.com/kelseyhightower/envconfig) based configuration environment variables into
@@ -43,7 +43,7 @@ func GetBuilderKey() (string, error) {
 }
 
 func GetStorageParams(env sys.Env) (Parameters, error) {
-	params := make(map[string]string)
+	params := make(map[string]interface{})
 	files, err := ioutil.ReadDir(storageCredLocation)
 	if err != nil {
 		return nil, err
@@ -60,13 +60,15 @@ func GetStorageParams(env sys.Env) (Parameters, error) {
 			params[file.Name()] = string(data)
 		}
 	}
+	params["bucket"] = params["builder-bucket"]
+	params["container"] = params["builder-container"]
 	if env.Get("BUILDER_STORAGE") == "minio" {
 		mHost := env.Get(minioHostEnvVar)
 		mPort := env.Get(minioPortEnvVar)
 		params["regionendpoint"] = fmt.Sprintf("http://%s:%s", mHost, mPort)
 		params["secure"] = "false"
 		params["region"] = "us-east-1"
-		params["builder-bucket"] = "git"
+		params["bucket"] = "git"
 	}
 
 	return params, nil