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

Moves main into cmd dir. (#977)

Browse Source
This commit is contained in:
Travis Reeder
2018-05-09 00:52:52 -07:00
committed by Denis Makogon
parent b81ac1d2d2
commit 999820d15b
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
RUN apk --no-cache add build-base git bzr mercurial gcc RUN apk --no-cache add build-base git bzr mercurial gcc
ENV D=/go/src/github.com/fnproject/fn ENV D=/go/src/github.com/fnproject/fn
ADD . $D ADD . $D
RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/ RUN cd $D/cmd/fnserver && go build -o fn-alpine && cp fn-alpine /tmp/
# final stage: the local fnproject/dind:latest will be either built afresh or # final stage: the local fnproject/dind:latest will be either built afresh or
# whatever is the latest from master, depending on whether we're releasing # whatever is the latest from master, depending on whether we're releasing

4
Makefile
View File

@@ -8,10 +8,10 @@ dep-up:
dep ensure dep ensure
build: api/agent/grpc/runner.pb.go build: api/agent/grpc/runner.pb.go
go build -o fnserver go build -o fnserver ./cmd/fnserver
install: install:
go build -o ${GOPATH}/bin/fnserver go build -o ${GOPATH}/bin/fnserver ./cmd/fnserver
checkfmt: checkfmt:
./go-fmt.sh ./go-fmt.sh

2
build.ps1
View File

@@ -21,7 +21,7 @@ function quick() {
} }
function build () { function build () {
docker run --rm -v ${pwd}:/go/src/github.com/fnproject/fn -w /go/src/github.com/fnproject/fn golang:alpine go build -o fn-alpine docker run --rm -v ${pwd}:/go/src/github.com/fnproject/fn -w /go/src/github.com/fnproject/fn/cmd/fnserver golang:alpine go build -o fn-alpine
docker build -t fnproject/fnserver:latest . docker build -t fnproject/fnserver:latest .
function run () { function run () {

0
main.go → cmd/fnserver/main.go
View File

2
examples/extensions/README.md
View File

@@ -1,6 +1,6 @@
# Extensions Example # Extensions Example
This example adds extra endpoints to the API. See [main.go](main.go) for example code. This example adds extra endpoints to the API. See [main.go](main.go) for example code.
## Building and Running ## Building and Running

2
images/api/Dockerfile
View File

@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
RUN apk --no-cache add build-base git bzr mercurial gcc RUN apk --no-cache add build-base git bzr mercurial gcc
ENV D=/go/src/github.com/fnproject/fn ENV D=/go/src/github.com/fnproject/fn
ADD . $D ADD . $D
RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/ RUN cd $D/cmd/fnserver && go build -o fn-alpine && cp fn-alpine /tmp/
# final stage: the local fnproject/dind:latest will be either built afresh or # final stage: the local fnproject/dind:latest will be either built afresh or
# whatever is the latest from master, depending on whether we're releasing # whatever is the latest from master, depending on whether we're releasing

2
images/lb/Dockerfile
View File

@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
RUN apk --no-cache add build-base git bzr mercurial gcc RUN apk --no-cache add build-base git bzr mercurial gcc
ENV D=/go/src/github.com/fnproject/fn ENV D=/go/src/github.com/fnproject/fn
ADD . $D ADD . $D
RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/ RUN cd $D/cmd/fnserver && go build -o fn-alpine && cp fn-alpine /tmp/
# final stage: the local fnproject/dind:latest will be either built afresh or # final stage: the local fnproject/dind:latest will be either built afresh or
# whatever is the latest from master, depending on whether we're releasing # whatever is the latest from master, depending on whether we're releasing

2
images/runner/Dockerfile
View File

@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
RUN apk --no-cache add build-base git bzr mercurial gcc RUN apk --no-cache add build-base git bzr mercurial gcc
ENV D=/go/src/github.com/fnproject/fn ENV D=/go/src/github.com/fnproject/fn
ADD . $D ADD . $D
RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/ RUN cd $D/cmd/fnserver && go build -o fn-alpine && cp fn-alpine /tmp/
# final stage: the local fnproject/dind:latest will be either built afresh or # final stage: the local fnproject/dind:latest will be either built afresh or
# whatever is the latest from master, depending on whether we're releasing # whatever is the latest from master, depending on whether we're releasing