From 37179aeb33db3fdabc63c444b3ba4bfa35cc8d38 Mon Sep 17 00:00:00 2001 From: Mark Sanders Date: Mon, 22 Jan 2024 17:07:58 -0500 Subject: [PATCH] fix(api): cleanup network api makefiles Signed-off-by: Mark Sanders --- network/cloud/Makefile | 2 +- network/evpn-gw/Makefile | 2 +- network/k8s/Makefile | 4 ++-- network/telco/Makefile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/network/cloud/Makefile b/network/cloud/Makefile index a71e650e..d6da076a 100644 --- a/network/cloud/Makefile +++ b/network/cloud/Makefile @@ -12,7 +12,7 @@ doc: # protoc doesn't include annotation and http googleapis, so we have to get them here curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" rm -rf "${PWD}"/google diff --git a/network/evpn-gw/Makefile b/network/evpn-gw/Makefile index 77e20dd6..bb2d8917 100644 --- a/network/evpn-gw/Makefile +++ b/network/evpn-gw/Makefile @@ -13,7 +13,7 @@ doc: # protoc doesn't include annotation and http googleapis, so we have to get them here curl -kL https://github.com/googleapis/googleapis/archive/master.tar.gz | tar --strip=1 -zxvf - googleapis-master/google/api - docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /common -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" + docker run --user=$$(id -u):$$(id -g) --rm --entrypoint=sh -v "${PWD}/../opinetcommon":/opinetcommon -v "${PWD}"/v1alpha1/:/out -w /out -v "${PWD}":/protos pseudomuto/protoc-gen-doc:1.5.1 -c "protoc -I /opinetcommon -I /protos --doc_out=/out --doc_opt=markdown,autogen.md /protos/*.proto" rm -rf "${PWD}"/google diff --git a/network/k8s/Makefile b/network/k8s/Makefile index 45755d0c..0eef99ef 100644 --- a/network/k8s/Makefile +++ b/network/k8s/Makefile @@ -18,7 +18,7 @@ doc: buflint: - docker run --rm -v "${PWD}/../../common":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint bufgen: - docker run --rm -v "${PWD}/../../common":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 diff --git a/network/telco/Makefile b/network/telco/Makefile index 45755d0c..0eef99ef 100644 --- a/network/telco/Makefile +++ b/network/telco/Makefile @@ -18,7 +18,7 @@ doc: buflint: - docker run --rm -v "${PWD}/../../common":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}":/out -w /out bufbuild/buf lint bufgen: - docker run --rm -v "${PWD}/../../common":/common -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1 + docker run --rm -v "${PWD}/../opinetcommon":/opinnetcommon -v "${PWD}/../..":/base -v "${PWD}":/out -w /out msandersdell/bufbuild-go-gen:1.1.0 generate --template /base/buf.gen.yaml -o v1alpha1