Commit 5c93c2a0 authored by Matt Butcher's avatar Matt Butcher

fix(proto): keep a local protoc Go plugin

This works around issues where $GOPATH/bin has a different version of
the protobuf Go plugin than the one Kubernetes uses.
parent becaf4ce
...@@ -81,5 +81,6 @@ ifndef HAS_GIT ...@@ -81,5 +81,6 @@ ifndef HAS_GIT
$(error You must install Git) $(error You must install Git)
endif endif
glide install glide install
go build -o bin/protoc-gen-go ./vendor/github.com/golang/protobuf/protoc-gen-go
include versioning.mk include versioning.mk
...@@ -22,16 +22,18 @@ services_pkg = services ...@@ -22,16 +22,18 @@ services_pkg = services
google_deps = Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any google_deps = Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any
.PHONY: all
all: chart release services all: chart release services
chart: chart:
protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(chart_pbs) PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(chart_pbs)
release: release:
protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(release_pbs) PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias):$(dst) $(release_pbs)
services: services:
protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias),$(release_ias):$(dst) $(services_pbs) PATH=../bin:$(PATH) protoc --$(target)_out=plugins=$(plugins),$(google_deps),$(chart_ias),$(release_ias):$(dst) $(services_pbs)
.PHONY: clean
clean: clean:
@rm -rf $(dst)/hapi 2>/dev/null @rm -rf $(dst)/hapi 2>/dev/null
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment