commonfiles-master-2019-11-26T07-29-27 (#19318)

rh-bjeon · Dec 2, 2019 · 08da2a1 · 08da2a1
1 parent ea2600c
commit 08da2a1
Show file tree

Hide file tree

Showing 10 changed files with 126 additions and 63 deletions.
diff --git a/Makefile b/Makefile
@@ -58,7 +58,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:master-2019-11-14T12-01-13
+IMG ?= gcr.io/istio-testing/build-tools:master-2019-11-26T07-29-27
 UID = $(shell id -u)
 GID = `grep docker /etc/group | cut -f3 -d:`
 PWD = $(shell pwd)

diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
@@ -1 +1 @@
-7e482819013f4afc18304e37cb4875ae7a3e8351
+b54cc652c3bc425e504d32de4080d186c83b0ef8
diff --git a/common/scripts/report_build_info.sh b/common/scripts/report_build_info.sh
@@ -43,7 +43,7 @@ if [[ -n ${ISTIO_VERSION} ]]; then
 fi
 
 GIT_DESCRIBE_TAG=$(git describe --tags)
-HUB=${HUB:-"docker.io"}
+HUB=${HUB:-"docker.io/istio"}
 
 # used by common/scripts/gobuild.sh
 echo "istio.io/pkg/version.buildVersion=${VERSION}"

diff --git a/galley/pkg/config/meta/metadata/metadata.gen.go b/galley/pkg/config/meta/metadata/metadata.gen.go
diff --git a/galley/pkg/config/testing/basicmeta/basicmeta.gen.go b/galley/pkg/config/testing/basicmeta/basicmeta.gen.go
diff --git a/galley/pkg/config/testing/data/builtin.gen.go b/galley/pkg/config/testing/data/builtin.gen.go
diff --git a/galley/pkg/config/testing/k8smeta/k8smeta.gen.go b/galley/pkg/config/testing/k8smeta/k8smeta.gen.go
diff --git a/mixer/pkg/adapter/test/fixtures.gen.go b/mixer/pkg/adapter/test/fixtures.gen.go
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		7e482819013f4afc18304e37cb4875ae7a3e8351
		b54cc652c3bc425e504d32de4080d186c83b0ef8