Skip to content

Commit

Permalink
Update common files. (istio#330)
Browse files Browse the repository at this point in the history
  • Loading branch information
geeknoid authored and istio-testing committed Oct 9, 2019
1 parent 139b700 commit 75e0b62
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 238 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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-02T16-55-19
IMG ?= gcr.io/istio-testing/build-tools:2019-10-08T20-57-24
UID = $(shell id -u)
PWD = $(shell pwd)

Expand All @@ -68,7 +68,7 @@ $(info Building with the build container: $(IMG).)
# the path of the file.
TIMEZONE=`readlink $(READLINK_FLAGS) /etc/localtime | sed -e 's/^.*zoneinfo\///'`

RUN = $(CONTAINER_CLI) run -t -i --sig-proxy=true -u $(UID):docker --rm \
RUN = $(CONTAINER_CLI) run --net=host -t -i --sig-proxy=true -u $(UID):docker --rm \
-e IN_BUILD_CONTAINER="$(BUILD_WITH_CONTAINER)" \
-e TZ="$(TIMEZONE)" \
-e TARGET_ARCH="$(TARGET_ARCH)" \
Expand Down
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c55dbd8338d5806b056e071580d58348dee999e2
ec75e60fbf17349287909b71278b2697f1827358
1 change: 1 addition & 0 deletions common/config/license-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ whitelisted_modules:
- github.com/juju/loggo
- github.com/juju/testing
- github.com/julienschmidt/httprouter
- github.com/koneu/natend
- github.com/kr/logfmt
- github.com/libopenstorage/openstorage
- github.com/logrusorgru/aurora
Expand Down
Loading

0 comments on commit 75e0b62

Please sign in to comment.