Merge pull request #2 from engineyard/chore/upgrade-distribution

chore(deps): Move to go modules; Upgrade distribution to latest version.

Author: Cryptophobia

Makefile

@@ -1,5 +1,5 @@
 SHORT_NAME := object-storage-cli
-REPO_PATH := github.com/deis/${SHORT_NAME}
+REPO_PATH := github.com/teamhephy/${SHORT_NAME}
 
 HOST_OS := $(shell uname)
 ifeq ($(HOST_OS),Darwin)
@@ -8,7 +8,7 @@ else
 	GOOS=linux
 endif
 
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.11.1
+DEV_ENV_IMAGE := hephy/go-dev:v1.26.2
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
@@ -21,7 +21,7 @@ GO_LDFLAGS = -ldflags "-s -X ${REPO_PATH}/version.BuildVersion=${VERSION}"
 VERSION ?= $(shell git rev-parse --short HEAD)
 
 bootstrap:
-	${DEV_ENV_CMD} glide install
+	${DEV_ENV_CMD} go mod vendor
 
 build: binary-build
 
@@ -40,4 +40,4 @@ binary-build:
 dist: build-all
 
 test:
-	${DEV_ENV_CMD} go test $$(glide nv)
+	${DEV_ENV_CMD} go test ./...

glide.lock

@@ -0,0 +1,29 @@
+module object-storage-cli
+
+go 1.14
+
+require (
+	github.com/Azure/azure-sdk-for-go v16.2.1+incompatible // indirect
+	github.com/Sirupsen/logrus v0.7.3 // indirect
+	github.com/arschles/assert v0.0.0-20160218172821-d21ecd4884be
+	github.com/aws/aws-sdk-go v1.15.11 // indirect
+	github.com/codegangsta/cli v1.13.1-0.20160326223947-bc465becccd1
+	github.com/deis/object-storage-cli v0.0.0-20180301165133-c4ae08b0bf39
+	github.com/docker/distribution v0.0.0-00010101000000-000000000000
+	github.com/go-ini/ini v1.25.4 // indirect
+	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/gorilla/context v0.0.0-20140604161150-14f550f51af5 // indirect
+	github.com/gorilla/mux v1.7.2 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 // indirect
+	github.com/kelseyhightower/envconfig v1.1.1-0.20160316193706-cea086319492
+	github.com/mitchellh/mapstructure v1.1.2 // indirect
+	github.com/ncw/swift v1.0.47 // indirect
+	golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b // indirect
+	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
+	google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff // indirect
+	google.golang.org/appengine v1.4.0 // indirect
+	google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8 // indirect
+	google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a // indirect
+)
+
+replace github.com/docker/distribution => github.com/teamhephy/distribution v0.0.0-20200427164433-c77f65b80cb8