Fix docker args

bufbuild · Oct 29, 2019 · 17ffe0a · 17ffe0a
1 parent af71b13
commit 17ffe0a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Dockerfile.workspace b/Dockerfile.workspace
@@ -1,8 +1,8 @@
+FROM golang:1.13.3-alpine3.10
+
 ARG PROJECT
 ARG GO_MODULE
 
-FROM golang:1.13.3-alpine3.10
-
 ENV \
   CACHE_BASE=/cache/$PROJECT \
   GO111MODULE=on \

diff --git a/make/base.mk b/make/base.mk
@@ -52,6 +52,7 @@ envrestore:
 direnv:
 	@mkdir -p $(CACHE_ENV)
 	@rm -f $(CACHE_ENV)/env.sh
+	@echo 'export CACHE="$(abspath $(CACHE))"' >> $(CACHE_ENV)/env.sh
 	@echo 'export GO111MODULE="$(GO111MODULE)"' >> $(CACHE_ENV)/env.sh
 	@echo 'export GOPRIVATE="$(GOPRIVATE)"' >> $(CACHE_ENV)/env.sh
 	@echo 'export GOPATH="$(GOPATH)"' >> $(CACHE_ENV)/env.sh

diff --git a/make/buf/all.mk b/make/buf/all.mk
@@ -1,13 +1,12 @@
 PROTO_PATH := proto
 PROTOC_GEN_GO_OUT := internal/gen/proto
-GO_BINS := \
+GO_BINS := $(GO_BINS) \
 	buf \
 	protoc-gen-buf-check-breaking \
 	protoc-gen-buf-check-lint
 GO_GET_PKGS := github.com/jhump/protoreflect@master
 
-DOCKER_BINS := \
-	buf
+DOCKER_BINS := $(DOCKER_BINS) buf
 
 include make/buf/versions.mk
 include make/base.mk