From c01085c448fa2022f639a8fc82b148f3316446f9 Mon Sep 17 00:00:00 2001 From: Matthias Frei Date: Thu, 25 Jul 2019 13:06:12 +0200 Subject: [PATCH] Skip gogen step in docker build to allow gogencheck step --- Makefile | 10 ++++++---- docker/perapp/base/Dockerfile.builder | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a7c1580580..5c8c65b25e 100644 --- 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 index 0e5503f45d..9966370898 100644 --- 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