Skip to content

Commit 8bc7b11

Browse files
committed
[storage] [make] don;t copy files, map folders
Signed-off-by: Boris Glimcher <[email protected]>
1 parent 2a92847 commit 8bc7b11

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

storage/Makefile

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,9 @@ all:
1111
docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v "${PWD}/../common/v1":/common namely/protoc-all:1.47_2 -i /common --lint -d v1alpha1 -l python -o ./v1alpha1/gen/python/ --go-source-relative
1212
docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}":/defs -v "${PWD}/../common/v1":/common namely/protoc-all:1.47_2 -i /common --lint -d v1alpha1 -l java -o ./v1alpha1/gen/java/ --go-source-relative
1313

14-
# protoc-gen-doc doesn't support proto include paths parameter so we have to copy
15-
# common included files to the proto directory
16-
cp ../common/v1/uuid.proto "${PWD}"/v1alpha1
17-
cp ../common/v1/object_key.proto "${PWD}"/v1alpha1
14+
# protoc doesn't include annotation and http googleapis, so we have to get them here
1815
curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api
1916
mv google "${PWD}"/v1alpha1/
20-
21-
docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1alpha1/:/out -v "${PWD}"/v1alpha1:/protos pseudomuto/protoc-gen-doc --doc_opt=markdown,autogen.md
22-
docker run --user=$$(id -u):$$(id -g) --rm -v "${PWD}"/v1alpha1/:/out -w /out --entrypoint=sh ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter /out/*.proto --output-format summary"
23-
24-
# remove common included files from the proto directory
25-
rm "${PWD}"/v1alpha1/uuid.proto
26-
rm "${PWD}"/v1alpha1/object_key.proto
27-
rm -rf "${PWD}"/v1alpha1/google
17+
docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out ghcr.io/docker-multiarch/google-api-linter:1.36.0 -c "api-linter -I /common /out/*.proto --output-format summary"
18+
docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../common/v1":/common -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}"/v1alpha1:/protos pseudomuto/protoc-gen-doc -c "protoc -I /common -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto /common/*.proto"
19+
rm -rf "${PWD}"/v1alpha1/google

0 commit comments

Comments
 (0)