Update the common files. #1020
Update the common files. #1020
Conversation
googlebot
added
the
cla: yes
istio-testing
added
the
size/XL
| @$(MAKE) $@ | ||
|
|
||
| default: | ||
| @$(MAKE) |
There was a problem hiding this comment.
planning to transition this repo to the new build system with this pr?
There was a problem hiding this comment.
Nope. Just updating the common files.
There was a problem hiding this comment.
Oh build-with-container=0. got it.
| SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
| ROOTDIR=$(dirname "${SCRIPTPATH}") | ||
|
|
||
| img=gcr.io/istio-testing/api-build-tools:2019-07-30 |
There was a problem hiding this comment.
note for the future - we should attempt to consolidate this container into the build-tools container. I believe it contains a subset of the build-tools container at this time.
There was a problem hiding this comment.
Correct. Next step.
| @@ -0,0 +1,339 @@ | |||
| all: generate | |||
There was a problem hiding this comment.
Yes, but sadly since I'm adding another file called Makefile, git doesn't realize I did a rename for this file.
| @$(MAKE) $@ | ||
|
|
||
| default: | ||
| @$(MAKE) |
There was a problem hiding this comment.
Oh build-with-container=0. got it.
| @@ -0,0 +1,339 @@ | |||
| all: generate | |||
| SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
| ROOTDIR=$(dirname "${SCRIPTPATH}") | ||
|
|
||
| img=gcr.io/istio-testing/api-build-tools:2019-07-30 |
Makefile.core.mk
Outdated
| @@ -14,9 +14,9 @@ repo_mount := $(mount_dir)/istio.io/api | |||
| out_path = . | |||
| uid := $(shell id -u) | |||
|
|
|||
| protoc = docker run --user $(uid) -v /etc/passwd:/etc/passwd:ro --rm -v $(pwd):$(repo_mount) -w $(mount_dir) $(apitools_img) protoc -I/usr/include/protobuf -I$(repo_dir) | |||
| protoc = docker run --user $(uid) -v /etc/passwd:/etc/passwd:ro --rm -v $(pwd):$(repo_mount) -w $(mount_dir) $(buildtools_img) protoc -I/usr/include/protobuf -I$(repo_dir) | |||
There was a problem hiding this comment.
you will need many of the same mounts to get this moving that are in the main makefile.
There was a problem hiding this comment.
also the dockerfile may need permissions changes to get this working - I have the existing dockerfile pretty locked down perm wise.
No description provided.