From 53a8de8a7e34bf5a2d52d66775a74e22e6066973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Jochum?= Date: Sun, 11 Sep 2022 11:28:59 +0200 Subject: [PATCH] No need for protoc_gen_shared.sh --- docker/builder/scripts/protoc_gen.sh | 2 +- docker/builder/scripts/protoc_gen_shared.sh | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100755 docker/builder/scripts/protoc_gen_shared.sh diff --git a/docker/builder/scripts/protoc_gen.sh b/docker/builder/scripts/protoc_gen.sh index 813674d..01138ed 100755 --- a/docker/builder/scripts/protoc_gen.sh +++ b/docker/builder/scripts/protoc_gen.sh @@ -1,2 +1,2 @@ #!/bin/sh -find . -name '*.proto' -print0 | xargs -0 -I {} /bin/sh -c 'cd $(dirname $1); PATH=$PATH:/go/bin protoc --micro_out=paths=source_relative:. --go_out=paths=source_relative:. $(basename $1)' '_' '{}' \ No newline at end of file +find . -name '*.proto' -print0 | xargs -0 -I {} /bin/sh -c 'cd $(dirname $1); protoc --proto_path=$GOPATH/bin:. -I/code --micro_out=paths=source_relative:. --go_out=paths=source_relative:. $(basename $1)' '_' '{}' \ No newline at end of file diff --git a/docker/builder/scripts/protoc_gen_shared.sh b/docker/builder/scripts/protoc_gen_shared.sh deleted file mode 100755 index c312c5f..0000000 --- a/docker/builder/scripts/protoc_gen_shared.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -ex - -# Build shared -if test -d /code/shared/proto; then - for proto in $(find /code/shared/proto -type f -name '*.proto' -print0 | xargs -0); do - cd $(dirname ${proto}) - protoc -I/code --proto_path=$GOPATH/bin:. --micro_out=paths=source_relative:. --go_out=paths=source_relative:. $(basename ${proto}) - done -fi - -for proto in $(find /code/service -type f -name '*.proto' -print0 | xargs -0); do - cd $(dirname ${proto}) - protoc -I/code --proto_path=$GOPATH/bin:. --micro_out=paths=source_relative:. --go_out=paths=source_relative:. $(basename ${proto}) -done - -cd /code