Skip to content

Commit d4c0b38

Browse files
Automator: update common-files@master in istio/api@master (#2755)
1 parent 60a4392 commit d4c0b38

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

common/.commonfiles.sha

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c652fc10a113014c3755778e971603fcbfefb0fa
1+
b7e9c0ef62f5ed2794d894cd086a016d6b141955

common/Makefile.common.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@ mirror-licenses: mod-download-go
9393
TMP := $(shell mktemp -d -u)
9494
UPDATE_BRANCH ?= "master"
9595

96+
BUILD_TOOLS_ORG ?= "istio"
97+
9698
update-common:
9799
@mkdir -p $(TMP)
98-
@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
100+
@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/$(BUILD_TOOLS_ORG)/common-files $(TMP)/common-files
99101
@cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha
100102
@rm -fr common
101103
@CONTRIB_OVERRIDE=$(shell grep -l "istio/community/blob/master/CONTRIBUTING.md" CONTRIBUTING.md)

common/scripts/setup_env.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ else
7272
fi
7373

7474
# Build image to use
75+
TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
76+
PROJECT_ID=${PROJECT_ID:-istio-testing}
7577
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
7678
IMAGE_VERSION=master-04cfef4d3b89cbc1a32f2983460724ac4f450154
7779
fi
@@ -89,7 +91,7 @@ TARGET_OUT_LINUX="${TARGET_OUT_LINUX:-$(pwd)/out/linux_${TARGET_ARCH}}"
8991
CONTAINER_TARGET_OUT="${CONTAINER_TARGET_OUT:-/work/out/${TARGET_OS}_${TARGET_ARCH}}"
9092
CONTAINER_TARGET_OUT_LINUX="${CONTAINER_TARGET_OUT_LINUX:-/work/out/linux_${TARGET_ARCH}}"
9193

92-
IMG="${IMG:-gcr.io/istio-testing/${IMAGE_NAME}:${IMAGE_VERSION}}"
94+
IMG="${IMG:-${TOOLS_REGISTRY_PROVIDER}/${PROJECT_ID}/${IMAGE_NAME}:${IMAGE_VERSION}}"
9395

9496
CONTAINER_CLI="${CONTAINER_CLI:-docker}"
9597

0 commit comments

Comments
 (0)