Fix gen-check target. (istio#17566)

lcdevelop · Oct 2, 2019 · 8bebb46 · 8bebb46
1 parent ea5b2dd
commit 8bebb46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -57,7 +57,7 @@ TARGET_OUT ?= $(HOME)/istio_out/$(REPO_NAME)
 ifeq ($(BUILD_WITH_CONTAINER),1)
 CONTAINER_CLI ?= docker
 DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
-IMG ?= gcr.io/istio-testing/build-tools:2019-10-01T21-32-16
+IMG ?= gcr.io/istio-testing/build-tools:2019-10-02T14-57-08
 UID = $(shell id -u)
 PWD = $(shell pwd)
 
@@ -69,6 +69,7 @@ $(info Building with the build container: $(IMG).)
 TIMEZONE=`readlink $(READLINK_FLAGS) /etc/localtime | sed -e 's/^.*zoneinfo\///'`
 
 RUN = $(CONTAINER_CLI) run -t -i --sig-proxy=true -u $(UID):docker --rm \
+	-e IN_BUILD_CONTAINER="$(BUILD_WITH_CONTAINER)" \
 	-e TZ="$(TIMEZONE)" \
 	-e TARGET_ARCH="$(TARGET_ARCH)" \
 	-e TARGET_OS="$(TARGET_OS)" \

diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
@@ -1 +1 @@
-9f111cfd1e041496728a058466f95b5affe8365e
+b1e0a3365f839f30d6f3f0760193bb18ce76adb1
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
@@ -95,6 +95,6 @@ update-common-protos:
 	@rm -fr common-files
 
 check-clean-repo:
-	@scripts/check_clean_repo.sh
+	@common/scripts/check_clean_repo.sh
 
 .PHONY: lint-dockerfiles lint-scripts lint-yaml lint-copyright-banner lint-go lint-python lint-helm lint-markdown lint-sass lint-typescript lint-protos lint-all format-go format-python format-protos update-common update-common-protos lint-licenses dump-licenses dump-licenses-csv check-clean-repo
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		9f111cfd1e041496728a058466f95b5affe8365e
		b1e0a3365f839f30d6f3f0760193bb18ce76adb1