Merge pull request #50 from Cryptophobia/master

fix(glide): fix build dependencies using glide

Author: Cryptophobia

.travis.yml

@@ -1,4 +1,5 @@
 sudo: required
+dist: trusty
 language: go
 services:
 - docker

Makefile

@@ -3,7 +3,7 @@ SHORT_NAME ?= builder
 include versioning.mk
 
 # dockerized development environment variables
-REPO_PATH := github.com/deis/${SHORT_NAME}
+REPO_PATH := github.com/teamhephy/${SHORT_NAME}
 DEV_ENV_IMAGE := quay.io/deis/go-dev:v0.22.0
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}

README.md

@@ -2,7 +2,7 @@
 # Hephy Builder v2
 
 [![Build Status](https://ci.deis.io/job/builder/badge/icon)](https://ci.deis.io/job/builder) [![codecov](https://codecov.io/gh/deis/builder/branch/master/graph/badge.svg)](https://codecov.io/gh/deis/builder)
-[![Go Report Card](https://goreportcard.com/badge/github.com/deis/builder)](https://goreportcard.com/report/github.com/deis/builder)[![codebeat badge](https://codebeat.co/badges/e29e5e2b-531d-4374-810b-f05053c47688)](https://codebeat.co/projects/github-com-deis-builder) [![Docker Repository on Quay](https://quay.io/repository/deisci/builder/status "Docker Repository on Quay")](https://quay.io/repository/deisci/builder)
+[![Go Report Card](https://goreportcard.com/badge/github.com/teamhephy/builder)](https://goreportcard.com/report/github.com/teamhephy/builder)[![codebeat badge](https://codebeat.co/badges/e29e5e2b-531d-4374-810b-f05053c47688)](https://codebeat.co/projects/github-com-deis-builder) [![Docker Repository on Quay](https://quay.io/repository/deisci/builder/status "Docker Repository on Quay")](https://quay.io/repository/deisci/builder)
 
 Hephy - A Fork of Deis Workflow
 

boot.go

@@ -6,21 +6,21 @@ import (
 	"runtime"
 
 	"github.com/codegangsta/cli"
-	"github.com/deis/builder/pkg"
-	"github.com/deis/builder/pkg/cleaner"
-	"github.com/deis/builder/pkg/conf"
-	"github.com/deis/builder/pkg/gitreceive"
-	"github.com/deis/builder/pkg/healthsrv"
-	"github.com/deis/builder/pkg/sshd"
-	"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"
 	_ "github.com/docker/distribution/registry/storage/driver/swift"
 	"github.com/kelseyhightower/envconfig"
+	"github.com/teamhephy/builder/pkg"
+	"github.com/teamhephy/builder/pkg/cleaner"
+	"github.com/teamhephy/builder/pkg/conf"
+	"github.com/teamhephy/builder/pkg/gitreceive"
+	"github.com/teamhephy/builder/pkg/healthsrv"
+	"github.com/teamhephy/builder/pkg/sshd"
+	"github.com/teamhephy/builder/pkg/sys"
+	pkglog "github.com/teamhephy/pkg/log"
 	kcl "k8s.io/kubernetes/pkg/client/unversioned"
 )
 

charts/builder/Chart.yaml

@@ -3,5 +3,4 @@ home: https://github.com/teamhephy/builder
 version: <Will be populated by the ci before publishing the chart>
 description: Git server and application builder for Deis Workflow.
 maintainers:
-  - name: Deis Team
-    email: [email protected]
+- email: [email protected]

charts/builder/values.yaml

@@ -1,4 +1,4 @@
-org: "deisci"
+org: "hephy"
 pull_policy: "Always"
 docker_tag: canary
 # limits_cpu: "100m"

glide.lock

@@ -1,4 +1,4 @@
-package: github.com/deis/builder
+package: github.com/teamhephy/builder
 ignore:
 - appengine
 - appengine/memcache
@@ -15,8 +15,8 @@ import:
 - package: gopkg.in/yaml.v2
   version: eca94c41d994ae2215d455ce578ae6e2dc6ee516
 - package: github.com/pborman/uuid
-- package: github.com/deis/pkg
-  version: 00e55bded444eea7fadff398f93152e962a0c338
+- package: github.com/teamhephy/pkg
+  version: 777f37a30108edaf6a2bd4e423cde34ec12870fd
   subpackages:
   - time
   - log
@@ -41,5 +41,5 @@ import:
   version: 8e7dc108ab3a1ab6ce6d922bbaff5657b88e8e49
   repo: https://github.com/spf13/pflag
   vcs: git
-- package: github.com/deis/controller-sdk-go
-  version: 27bab7c5535de202635877fa7600d5158b91a757
+- package: github.com/teamhephy/controller-sdk-go
+  version: a1ffb4886a5f7f92fdd710b99e68c2555b74a703

glide.yaml

@@ -7,8 +7,8 @@ package pkg
 import (
 	"fmt"
 
-	"github.com/deis/builder/pkg/sshd"
-	"github.com/deis/pkg/log"
+	"github.com/teamhephy/builder/pkg/sshd"
+	"github.com/teamhephy/pkg/log"
 )
 
 // Return codes that will be sent to the shell.

pkg/builder.go

@@ -10,12 +10,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/deis/builder/pkg/gitreceive"
-	"github.com/deis/builder/pkg/k8s"
-	"github.com/deis/builder/pkg/sys"
-	"github.com/deis/pkg/log"
 	"github.com/docker/distribution/context"
 	storagedriver "github.com/docker/distribution/registry/storage/driver"
+	"github.com/teamhephy/builder/pkg/gitreceive"
+	"github.com/teamhephy/builder/pkg/k8s"
+	"github.com/teamhephy/builder/pkg/sys"
+	"github.com/teamhephy/pkg/log"
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"