mirror of
https://github.com/fnproject/fn.git
synced 2022-10-28 21:29:17 +03:00
Moves main into cmd dir. (#977)
This commit is contained in:
committed by
Denis Makogon
parent
b81ac1d2d2
commit
999820d15b
@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
|
||||
RUN apk --no-cache add build-base git bzr mercurial gcc
|
||||
ENV D=/go/src/github.com/fnproject/fn
|
||||
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
|
||||
# whatever is the latest from master, depending on whether we're releasing
|
||||
|
||||
4
Makefile
4
Makefile
@@ -8,10 +8,10 @@ dep-up:
|
||||
dep ensure
|
||||
|
||||
build: api/agent/grpc/runner.pb.go
|
||||
go build -o fnserver
|
||||
go build -o fnserver ./cmd/fnserver
|
||||
|
||||
install:
|
||||
go build -o ${GOPATH}/bin/fnserver
|
||||
go build -o ${GOPATH}/bin/fnserver ./cmd/fnserver
|
||||
|
||||
checkfmt:
|
||||
./go-fmt.sh
|
||||
|
||||
@@ -21,7 +21,7 @@ function quick() {
|
||||
}
|
||||
|
||||
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 .
|
||||
|
||||
function run () {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# 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
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
|
||||
RUN apk --no-cache add build-base git bzr mercurial gcc
|
||||
ENV D=/go/src/github.com/fnproject/fn
|
||||
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
|
||||
# whatever is the latest from master, depending on whether we're releasing
|
||||
|
||||
@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
|
||||
RUN apk --no-cache add build-base git bzr mercurial gcc
|
||||
ENV D=/go/src/github.com/fnproject/fn
|
||||
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
|
||||
# whatever is the latest from master, depending on whether we're releasing
|
||||
|
||||
@@ -3,7 +3,7 @@ FROM golang:1.10-alpine AS build-env
|
||||
RUN apk --no-cache add build-base git bzr mercurial gcc
|
||||
ENV D=/go/src/github.com/fnproject/fn
|
||||
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
|
||||
# whatever is the latest from master, depending on whether we're releasing
|
||||
|
||||
Reference in New Issue
Block a user