alihan/fn-serverless
1
0
Fork 0
mirror of https://github.com/fnproject/fn.git synced 2022-10-28 21:29:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'chad-ux-improvements'

Browse Source 
# Conflicts:
#   Gopkg.lock
This commit is contained in:
Chad Arimura
2017-05-26 16:12:29 +00:00
parent 82f608558b ed46a61f51
commit 0954ee9c39
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Gopkg.lock generated
View File

@@ -1,4 +1,4 @@
memo = "bd1e1a24b7655bd27880d6b3d752e400a4e36e7b1d7129a1a9e54a11fac75c9c" memo = "f5b1c7d56bf54bc74276d2d9f46275abedb0dce21386c1418a79e1b0ea972c25"
[[projects]] [[projects]]
branch = "master" branch = "master"
@@ -55,10 +55,10 @@ memo = "bd1e1a24b7655bd27880d6b3d752e400a4e36e7b1d7129a1a9e54a11fac75c9c"
version = "v6" version = "v6"
[[projects]] [[projects]]
branch = "master"
name = "github.com/aws/aws-sdk-go" 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"] 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]] [[projects]]
branch = "master" branch = "master"
@@ -509,4 +509,4 @@ memo = "bd1e1a24b7655bd27880d6b3d752e400a4e36e7b1d7129a1a9e54a11fac75c9c"
branch = "v2" branch = "v2"
name = "gopkg.in/yaml.v2" name = "gopkg.in/yaml.v2"
packages = ["."] packages = ["."]
revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b" revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"

2
Gopkg.toml
View File

@@ -4,8 +4,8 @@
name = "github.com/Sirupsen/logrus" name = "github.com/Sirupsen/logrus"
[[dependencies]] [[dependencies]]
branch = "master"
name = "github.com/aws/aws-sdk-go" name = "github.com/aws/aws-sdk-go"
version = "^v1.8.29"
[[dependencies]] [[dependencies]]
branch = "master" branch = "master"

10
Makefile
View File

@@ -25,10 +25,10 @@ run: build
docker-dep: docker-dep:
# todo: need to create a dep tool image for this (or just ditch this) # 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-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 build --build-arg HTTP_PROXY -t treeder/functions:latest .
docker-run: docker-build docker-run: docker-build
@@ -37,9 +37,9 @@ docker-run: docker-build
docker-test: docker-test:
docker run -ti --privileged --rm -e LOG_LEVEL=debug \ docker run -ti --privileged --rm -e LOG_LEVEL=debug \
-v /var/run/docker.sock:/var/run/docker.sock \ -v /var/run/docker.sock:/var/run/docker.sock \
-v ${CURDIR}:/go/src/github.com/treeder/functions \ -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions \
-w /go/src/github.com/treeder/functions \ -w /go/src/gitlab.oracledx.com/odx/functions \
funcy/go:dev go test \ 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 all: dep build