Update common files (istio#555)

Author: howardjohn

Makefile

@@ -56,7 +56,7 @@ ifeq ($(BUILD_WITH_CONTAINER),1)
 export TARGET_OUT = /work/out/$(TARGET_OS)_$(TARGET_ARCH)
 CONTAINER_CLI ?= docker
 DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
-IMG ?= gcr.io/istio-testing/build-tools:2019-10-24T14-05-17
+IMG ?= gcr.io/istio-testing/build-tools:master-2019-11-14T12-01-13
 UID = $(shell id -u)
 GID = `grep docker /etc/group | cut -f3 -d:`
 PWD = $(shell pwd)
@@ -81,14 +81,22 @@ $(info Using gcr credential directory $(HOME)/.config/gcloud.)
 DOCKER_CREDS_MOUNT+=--mount type=bind,source="$(HOME)/.config/gcloud",destination="/config/.config/gcloud",readonly
 endif
 
+ENV_VARS:=
+ifdef HUB
+ENV_VARS+=-e HUB="$(HUB)"
+endif
+ifdef TAG
+ENV_VARS+=-e TAG="$(TAG)"
+endif
+
 RUN = $(CONTAINER_CLI) run -t -i --sig-proxy=true -u $(UID):$(GID) --rm \
 	-e IN_BUILD_CONTAINER="$(BUILD_WITH_CONTAINER)" \
 	-e TZ="$(TIMEZONE)" \
 	-e TARGET_ARCH="$(TARGET_ARCH)" \
 	-e TARGET_OS="$(TARGET_OS)" \
 	-e TARGET_OUT="$(TARGET_OUT)" \
-	-e HUB="$(HUB)" \
-	-e TAG="$(TAG)" \
+	-e USER="${USER}" \
+	$(ENV_VARS) \
 	-v /etc/passwd:/etc/passwd:ro \
 	$(DOCKER_SOCKET_MOUNT) \
 	$(CONTAINER_OPTIONS) \
@@ -111,7 +119,7 @@ default:
 else
 
 $(info Building with your local toolchain.)
-GOBIN ?= $(GOPATH)/bin
+export GOBIN ?= $(GOPATH)/bin
 include Makefile.core.mk
 
 endif

common/.commonfiles.sha

@@ -1 +1 @@
-fed5206555d5f7687306fa063c7d4e9bf536c0ac
+70a676918f114f4d48e7784795c05d1b4ced7884

common/Makefile.common.mk

@@ -104,7 +104,7 @@ update-common-protos:
 	@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
 	@cd $(TMP)/common-files ; git rev-parse HEAD > common-protos/.commonfiles.sha
 	@rm -fr common-protos
-	@cp -ar $(TMP)/common-files/common-protos/* $(shell pwd)/common-protos
+	@cp -ar $(TMP)/common-files/common-protos $(shell pwd)
 	@rm -fr $(TMP)/common-files
 
 check-clean-repo:

common/config/license-lint.yml

@@ -71,7 +71,6 @@ whitelisted_modules:
   - github.com/daviddengcn/go-colortext
   - github.com/dchest/siphash
   - github.com/dnaeon/go-vcr
-  - github.com/docker/docker
   - github.com/duosecurity/duo_api_golang
   - github.com/dustin/go-humanize
   - github.com/facebookgo/stack
@@ -92,9 +91,6 @@ whitelisted_modules:
   - github.com/JeffAshton/win_pdh
   - github.com/jmespath/go-jmespath
   - github.com/jteeuwen/go-bindata
-  - github.com/juju/errors
-  - github.com/juju/loggo
-  - github.com/juju/testing
   - github.com/julienschmidt/httprouter
   - github.com/koneu/natend
   - github.com/kr/logfmt
@@ -118,7 +114,6 @@ whitelisted_modules:
   - github.com/russross/blackfriday
   - github.com/russross/blackfriday/v2
   - github.com/sean-/seed
-  - github.com/signalfx/com_signalfx_metrics_protobuf
   - github.com/smartystreets/assertions
   - github.com/smartystreets/goconvey
   - github.com/storageos/go-api

common/scripts/check_clean_repo.sh

@@ -15,7 +15,8 @@
 #   limitations under the License.
 
 if [[ -n $(git status --porcelain) ]]; then
-    git status
-  	echo "ERROR: Some files need to be updated, please run 'make gen' and include any changed files in your PR"
-  	exit 1
+  git status
+  git diff
+  echo "ERROR: Some files need to be updated, please run 'make gen' and include any changed files in your PR"
+  exit 1
 fi