From 0c6ca08a2ff1c1195db4fcb29e14cdb5f6c13963 Mon Sep 17 00:00:00 2001 From: Travis Reeder Date: Mon, 15 May 2017 14:04:01 -0700 Subject: [PATCH] functions: 0.2.62 release [skip ci] --- Dockerfile | 2 +- Makefile | 7 ++++--- api/version/version.go | 2 +- build.ps1 | 6 +++--- docs/function-file.md | 2 +- docs/lambda/aws.md | 2 +- fn/install.sh | 2 +- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 335f8ecc9..b6dd065d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM iron/dind +FROM treeder/dind WORKDIR /app diff --git a/Makefile b/Makefile index 04f2e07b9..71be9c258 100644 --- a/Makefile +++ b/Makefile @@ -29,16 +29,17 @@ docker-dep: docker-build: docker run --rm -v ${CURDIR}:/go/src/github.com/treeder/functions -w /go/src/github.com/treeder/functions iron/go:dev go build -o functions-alpine - docker build -t iron/functions:latest . + docker build -t treeder/functions:latest . docker-run: docker-build - docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v ${CURDIR}/data:/app/data -p 8080:8080 iron/functions + docker run --rm --privileged -it -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v ${CURDIR}/data:/app/data -p 8080:8080 treeder/functions 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 iron/go:dev go test \ + -w /go/src/github.com/treeder/functions \ + iron/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') all: dep build diff --git a/api/version/version.go b/api/version/version.go index 11c963e6c..d6d6f30d0 100644 --- a/api/version/version.go +++ b/api/version/version.go @@ -1,4 +1,4 @@ package version // Version of IronFunctions -var Version = "0.2.60" +var Version = "0.2.62" diff --git a/build.ps1 b/build.ps1 index b9bc10a62..4267a1354 100644 --- a/build.ps1 +++ b/build.ps1 @@ -21,12 +21,12 @@ function quick() { } function build () { - docker run --rm -v ${pwd}:/go/src/github.com/treeder/functions -w /go/src/github.com/treeder/functions iron/go:dev go build -o functions-alpine - docker build -t iron/functions:latest . + docker run --rm -v ${pwd}:/go/src/github.com/treeder/functions -w /go/src/github.com/treeder/functions golang:alpine go build -o functions-alpine + docker build -t treeder/functions:latest . } function run () { - docker run --rm --name functions -it -v /var/run/docker.sock:/var/run/docker.sock -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v $PWD/data:/app/data -p 8080:8080 iron/functions + docker run --rm --name functions -it -v /var/run/docker.sock:/var/run/docker.sock -e LOG_LEVEL=debug -e "DB_URL=bolt:///app/data/bolt.db" -v $PWD/data:/app/data -p 8080:8080 treeder/functions } switch ($cmd) diff --git a/docs/function-file.md b/docs/function-file.md index 7bd2facde..9064cd35d 100644 --- a/docs/function-file.md +++ b/docs/function-file.md @@ -10,7 +10,7 @@ The files can be named as: An example of a function file: ```yaml -name: iron/hello +name: treeder/hello version: 0.0.1 type: sync memory: 128 diff --git a/docs/lambda/aws.md b/docs/lambda/aws.md index e4876b9ed..b19db9bb9 100644 --- a/docs/lambda/aws.md +++ b/docs/lambda/aws.md @@ -47,7 +47,7 @@ The event will look like: ```js { - "bucket": "iron-lambda-demo-images", + "bucket": "lambda-demo-images", "srcKey": "waterfall.jpg", "dstKey": "waterfall-1024.jpg" } diff --git a/fn/install.sh b/fn/install.sh index 14ad3b907..2560e84a6 100644 --- a/fn/install.sh +++ b/fn/install.sh @@ -3,7 +3,7 @@ set -e # Install script to install fn -release="0.2.60" +release="0.2.62" command_exists() { command -v "$@" > /dev/null 2>&1