override image name (IMAGE_NAME) only (#2755)

* override image name (IMAGE_NAME) only

* update common-files

Makefile

@@ -19,6 +19,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+SHELL := /bin/bash
+
 # allow optional per-repo overrides
 -include Makefile.overrides.mk
 
@@ -28,8 +30,11 @@
 # figure out all the tools you need in your environment to make that work.
 export BUILD_WITH_CONTAINER ?= 0
 
+# Name of build container image
+IMAGE_NAME ?= build-tools
+
 # Version of image used within build container
-IMAGE_VERSION ?= master-2020-02-14T13-09-14
+IMAGE_VERSION ?= master-2020-03-05T18-27-04
 
 LOCAL_ARCH := $(shell uname -m)
 ifeq ($(LOCAL_ARCH),x86_64)
@@ -63,11 +68,12 @@ export TARGET_OUT = /work/out/$(TARGET_OS)_$(TARGET_ARCH)
 export TARGET_OUT_LINUX = /work/out/linux_amd64
 CONTAINER_CLI ?= docker
 DOCKER_SOCKET_MOUNT ?= -v /var/run/docker.sock:/var/run/docker.sock
-IMG ?= gcr.io/istio-testing/build-tools:$(IMAGE_VERSION)
+IMG ?= gcr.io/istio-testing/$(IMAGE_NAME):$(IMAGE_VERSION)
 UID = $(shell id -u)
 GID = `grep '^docker:' /etc/group | cut -f3 -d:`
 PWD = $(shell pwd)
 
+$(info If you suffer an unexpected failure, please reference: https://github.com/istio/istio/wiki/Troubleshooting-Development-Environment)
 $(info Building with the build container: $(IMG).)
 
 # Determine the timezone across various platforms to pass into the

Makefile.core.mk

@@ -99,7 +99,6 @@ check:
 lint: lint-copyright-banner format-go lint-go tidy-go
  @scripts/check-repository.sh
  @scripts/check-style.sh
- @scripts/check-build-tools-proxy.sh
 
 deb:
  export PATH=$(PATH) CC=$(CC) CXX=$(CXX) && bazel $(BAZEL_STARTUP_ARGS) build $(BAZEL_BUILD_ARGS) $(BAZEL_CONFIG_REL) //tools/deb:istio-proxy

Makefile.overrides.mk

@@ -14,4 +14,4 @@
 
 # this repo is not on the container plan by default
 BUILD_WITH_CONTAINER ?= 0
-IMG = gcr.io/istio-testing/build-tools-proxy:master-2020-02-14T13-09-14
+IMAGE_NAME = build-tools-proxy

common/.commonfiles.sha

@@ -1 +1 @@
-676a09f4d60d4efad991526b1fb99564e52fcd66
+35fd5021dab786eee474ffc5cb9bddfc3949d316

common/Makefile.common.mk

@@ -28,8 +28,9 @@ lint-dockerfiles:
 lint-scripts:
  @${FINDFILES} -name '*.sh' -print0 | ${XARGS} shellcheck
 
+# TODO(nmittler): disabled pipefail due to grep failing when no files contain "{{". Need to investigate options.
 lint-yaml:
- @${FINDFILES} \( -name '*.yml' -o -name '*.yaml' \) -print0 | ${XARGS} grep -L -e "{{" | xargs -r yamllint -c ./common/config/.yamllint.yml
+ @set +o pipefail; @${FINDFILES} \( -name '*.yml' -o -name '*.yaml' \) -print0 | ${XARGS} grep -L -e "{{" | xargs -r yamllint -c ./common/config/.yamllint.yml
 
 lint-helm:
  @${FINDFILES} -name 'Chart.yaml' -print0 | ${XARGS} -L 1 dirname | xargs -r helm lint --strict