diff --git a/Gopkg.lock b/Gopkg.lock index a915373dc..acdec870d 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,4 +1,4 @@ -memo = "bd1e1a24b7655bd27880d6b3d752e400a4e36e7b1d7129a1a9e54a11fac75c9c" +memo = "f5b1c7d56bf54bc74276d2d9f46275abedb0dce21386c1418a79e1b0ea972c25" [[projects]] branch = "master" @@ -55,10 +55,10 @@ memo = "bd1e1a24b7655bd27880d6b3d752e400a4e36e7b1d7129a1a9e54a11fac75c9c" version = "v6" [[projects]] - branch = "master" name = "github.com/aws/aws-sdk-go" packages = ["aws","aws/awserr","aws/awsutil","aws/client","aws/client/metadata","aws/corehandlers","aws/credentials","aws/credentials/ec2rolecreds","aws/credentials/endpointcreds","aws/credentials/stscreds","aws/defaults","aws/ec2metadata","aws/endpoints","aws/request","aws/session","aws/signer/v4","private/protocol","private/protocol/json/jsonutil","private/protocol/jsonrpc","private/protocol/query","private/protocol/query/queryutil","private/protocol/rest","private/protocol/restjson","private/protocol/xml/xmlutil","service/lambda","service/sts"] - revision = "0bc99f4aa1cf50245de234b1ce0b33463a3ad5fe" + revision = "e8177d9867544fa4677f40ceb470e60b6f3573ae" + version = "v1.8.29" [[projects]] branch = "master" @@ -509,4 +509,4 @@ memo = "bd1e1a24b7655bd27880d6b3d752e400a4e36e7b1d7129a1a9e54a11fac75c9c" branch = "v2" name = "gopkg.in/yaml.v2" packages = ["."] - revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b" + revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b" \ No newline at end of file diff --git a/Gopkg.toml b/Gopkg.toml index 0c8bb5c2d..c34ae3444 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -4,8 +4,8 @@ name = "github.com/Sirupsen/logrus" [[dependencies]] - branch = "master" name = "github.com/aws/aws-sdk-go" + version = "^v1.8.29" [[dependencies]] branch = "master" diff --git a/Makefile b/Makefile index 6821b3991..c4de3bdd2 100644 --- a/Makefile +++ b/Makefile @@ -25,10 +25,10 @@ run: build docker-dep: # todo: need to create a dep tool image for this (or just ditch this) - docker run --rm -it -v ${CURDIR}:/go/src/github.com/treeder/functions -w /go/src/github.com/treeder/functions treeder/glide install -v + docker run --rm -it -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions -w /go/src/gitlab.oracledx.com/odx/functions treeder/glide install -v docker-build: - docker run --rm -v ${CURDIR}:/go/src/github.com/treeder/functions -w /go/src/github.com/treeder/functions funcy/go:dev go build -o functions-alpine + docker run --rm -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions -w /go/src/gitlab.oracledx.com/odx/functions funcy/go:dev go build -o functions-alpine docker build --build-arg HTTP_PROXY -t treeder/functions:latest . docker-run: docker-build @@ -37,9 +37,9 @@ docker-run: docker-build docker-test: docker run -ti --privileged --rm -e LOG_LEVEL=debug \ -v /var/run/docker.sock:/var/run/docker.sock \ - -v ${CURDIR}:/go/src/github.com/treeder/functions \ - -w /go/src/github.com/treeder/functions \ + -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions \ + -w /go/src/gitlab.oracledx.com/odx/functions \ funcy/go:dev go test \ - -v $(shell docker run -ti -v ${CURDIR}:/go/src/github.com/treeder/functions -w /go/src/github.com/treeder/functions -e GOPATH=/go golang:alpine sh -c 'go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn | grep -v datastore') + -v $(shell docker run -ti -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions -w /go/src/gitlab.oracledx.com/odx/functions -e GOPATH=/go golang:alpine sh -c 'go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn | grep -v datastore') all: dep build