From f066fdc261429a1a00d2073fd76fd4d4f58f618e Mon Sep 17 00:00:00 2001 From: Greg Greenway Date: Thu, 12 Aug 2021 11:04:28 -0700 Subject: [PATCH] fix potential failure in verify-examples (#17698) If the `git checkout` of the specific tag causes `resource.go` to change, then it will fail if it is done after adding the test copy of `resource.go` due to discarding a local change. Signed-off-by: Greg Greenway --- examples/dynamic-config-cp/Dockerfile-control-plane | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/dynamic-config-cp/Dockerfile-control-plane b/examples/dynamic-config-cp/Dockerfile-control-plane index 3d475c734421..cc676ae2412f 100644 --- a/examples/dynamic-config-cp/Dockerfile-control-plane +++ b/examples/dynamic-config-cp/Dockerfile-control-plane @@ -6,7 +6,7 @@ RUN apt-get update \ && apt-get clean \ && rm -rf /tmp/* /var/tmp/* /var/lib/apt/lists/* -RUN git clone https://github.com/envoyproxy/go-control-plane +RUN git clone https://github.com/envoyproxy/go-control-plane && cd go-control-plane && git checkout b4adc3bb5fe5288bff01cd452dad418ef98c676e ADD ./resource.go /go/go-control-plane/internal/example/resource.go -RUN cd go-control-plane && git checkout b4adc3bb5fe5288bff01cd452dad418ef98c676e && make bin/example +RUN cd go-control-plane && make bin/example WORKDIR /go/go-control-plane