Skip gogen step in docker build to allow gogencheck step

scionproto · Jul 25, 2019 · c01085c · c01085c
1 parent fe333b0
commit c01085c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -16,12 +16,14 @@ clean:
 
 goenv: vendor
 
-gogen: gogen_clean
+gogen:
+ifndef GOGEN_SKIP
+	rm -f go/proto/*.gen.go go/proto/*.capnp.go
 	bazel build //go/proto:structs //go/proto:capnp
 	cp --no-preserve=mode bazel-genfiles/go/proto/gogen/* go/proto/
-
-gogen_clean:
-	rm -f go/proto/*.gen.go go/proto/*.capnp.go
+else
+	echo "gogen: skipped"
+endif
 
 vendor:
 	./tools/vendor.sh

diff --git a/docker/perapp/base/Dockerfile.builder b/docker/perapp/base/Dockerfile.builder
@@ -1,2 +1,2 @@
 FROM scion:latest
-RUN make -s all setcap && bazel clean
+RUN make -s all setcap GOGEN_SKIP=1 && bazel clean