Merge pull request #45 from Cryptophobia/master

chore(go-dev): upgrading go-dev container to v1.25.1

Author: Cryptophobia

.travis.yml

@@ -1,8 +1,10 @@
 sudo: required
 language: go
+go:
+- 1.12.x
 services:
 - docker
-script: make bootstrap && make test 
+script: make bootstrap && make test
 notifications:
   slack:
     secure: pWDCV3od8gxvzxh9DrOTvBL54XoCfWYhZZlwd2ZbyyOz6SS12Psg/ZuCT2253p4yMfF/LPlsz76mr7NgcCrMI0ReveTa/rnt3XBZtyY+1rlsQsy2oxgdAzbO587ENCQeMw2F/OWHaixMT8NDqxEqQd6xafK9Zmg6BeBjwgs7XfXKcR3WzNIuCO0ZG05+Yd0FIxmd/8Xm5tGiFEYr05+Ix6MLdF9MSCXZUPeu1EsYXhDljokLq49w63W1UMU10tm4t7VCEdaO+X9w6EJ5Ov8HDxb6L6IviUYY6+IGTZ01nwIoM6OrGQqfEAytYqgTKdehgQzQnAbLI6TW2wJ0twqEsLrlbTa4NW4j0KkazQJkN5kqcKYQvaeKJJhvJIG44Gi/u78pW3S6W7NU5DhrlE6bbxdIBHJW1vJBimkqu2oBNrO5ZoBB9MS9zflBsU5g/pQpVeHWMnWE8fcYDGa1PqAcr7q6wtdPsrVZhnHmmARN3PwZzIVVVsXbaIQG8VLC5grLGnwMf1Y1fz2nK3sVpCftvrYZT3G6CNAASo+eLOwYdZdiJ9jIS7WNLN1GtpIEvjeDt3QRqsDyH8YoAKUvY5h/v8IWPP/BaSwQbJwep4+Dj7xkpXX5/4wm4jEnVFV1p4xE0lD1AXvEMAVHtPhhggvscNhF9j6oeoPju6eTPcxG+5o=

Makefile

@@ -2,17 +2,17 @@ include includes.mk
 
 SHORT_NAME := router
 DEIS_REGISTRY ?= ${DEV_REGISTRY}
-IMAGE_PREFIX ?= deis
+IMAGE_PREFIX ?= hephy
 
 include versioning.mk
 
 SHELL_SCRIPTS = $(wildcard rootfs/bin/*) rootfs/opt/router/sbin/boot
 
-REPO_PATH := github.com/deis/${SHORT_NAME}
+REPO_PATH := github.com/teamhephy/${SHORT_NAME}
 
 # The following variables describe the containerized development environment
 # and other build options
-DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.10.0
+DEV_ENV_IMAGE := hephy/go-dev:v1.25.1
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_CMD := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}
 DEV_ENV_CMD_INT := docker run -it --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_IMAGE}

glide.yaml

@@ -1,4 +1,4 @@
-package: github.com/deis/router
+package: github.com/teamhephy/router
 flatten: true
 ignore:
   - k8s.io/kubernetes

model/model.go

@@ -7,8 +7,8 @@ import (
 	"log"
 	"strings"
 
-	"github.com/deis/router/utils"
-	modelerUtility "github.com/deis/router/utils/modeler"
+	"github.com/teamhephy/router/utils"
+	modelerUtility "github.com/teamhephy/router/utils/modeler"
 	"k8s.io/client-go/1.4/kubernetes"
 	"k8s.io/client-go/1.4/pkg/api"
 	"k8s.io/client-go/1.4/pkg/api/errors"

model/model_validation_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	modelerUtility "github.com/deis/router/utils/modeler"
+	modelerUtility "github.com/teamhephy/router/utils/modeler"
 )
 
 var (

nginx/config.go

@@ -8,7 +8,7 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-	"github.com/deis/router/model"
+	"github.com/teamhephy/router/model"
 )
 
 const (

nginx/config_test.go

@@ -12,7 +12,7 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig"
-	"github.com/deis/router/model"
+	"github.com/teamhephy/router/model"
 )
 
 func TestWriteCerts(t *testing.T) {

router.go

@@ -4,8 +4,8 @@ import (
 	"log"
 	"reflect"
 
-	"github.com/deis/router/model"
-	"github.com/deis/router/nginx"
+	"github.com/teamhephy/router/model"
+	"github.com/teamhephy/router/nginx"
 	"k8s.io/client-go/1.4/kubernetes"
 	"k8s.io/client-go/1.4/pkg/util/flowcontrol"
 	"k8s.io/client-go/1.4/rest"