Protobuf versioning fix (#7)

* Fixed GRPC versioning issue, updated protobuf files * Updated makefile for new golang build image
RackHD · Sep 13, 2016 · f438c51 · f438c51
1 parent 606c129
commit f438c51
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 57 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ SHELL = /bin/bash
 TTY = $(shell if [ -t 0 ]; then echo "-ti"; fi)
 
 DOCKER_DIR = /go/src/github.com/${ORGANIZATION}/${PROJECT}
-DOCKER_IMAGE = rackhd/golang:1.7.0-wheezy
+DOCKER_IMAGE = rackhd/golang:1.7.1-wheezy
 DOCKER_CMD = docker run --rm -v ${PWD}:${DOCKER_DIR} ${TTY} -w ${DOCKER_DIR} ${DOCKER_IMAGE}
 
 
@@ -71,6 +71,7 @@ build-local: lint-local
 	@go build -o $(GOOUT)/inservice-lldp $(LDFLAGS) plugins/lldp/*.go
 	@go build -o $(GOOUT)/inservice-catalog-compute $(LDFLAGS) plugins/catalog-compute/*.go
 	@go build -o $(GOOUT)/inservice-cli $(LDFLAGS) cmd/cli/*.go
+	@cp ./inservice.json $(GOOUT)/inservice.json
 
 
 lint:

diff --git a/agent/grpc/host/host.pb.go b/agent/grpc/host/host.pb.go
diff --git a/glide.lock b/glide.lock
diff --git a/plugins/lldp/grpc/lldp/lldp.pb.go b/plugins/lldp/grpc/lldp/lldp.pb.go