diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-01-29 11:27:26 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-01-29 14:51:45 -0800 |
| commit | a4c9218889bdc1c90146d3ca179f2afc4d3c32f2 (patch) | |
| tree | 96a14c857960d1500c9693a73eb967d1df2486f4 /tools | |
| parent | 2c1d5024adaa543a639d51068aca8a07fdc2c1fd (diff) | |
fixed mounting gen dir for docker
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/codegen/core/gen_load_balancing_proto.sh | 11 | ||||
| -rwxr-xr-x | tools/distrib/check_nanopb_output.sh | 4 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tools/codegen/core/gen_load_balancing_proto.sh b/tools/codegen/core/gen_load_balancing_proto.sh index 45c3282b3c..6918899d84 100755 --- a/tools/codegen/core/gen_load_balancing_proto.sh +++ b/tools/codegen/core/gen_load_balancing_proto.sh @@ -126,12 +126,11 @@ mv -v $TMPFILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.h" ls -l $OUTPUT_DIR -docker run --rm=false -v $OUTPUT_DIR:/lol -t grpc_clang_format \ - ls -l / -docker run --rm=true -v $OUTPUT_DIR:/lol -t grpc_clang_format \ - ls -l /lol - +readonly MOUNTPOINT='/protos' +docker run --rm=true -v ${HOST_GIT_ROOT}:$MOUNTPOINT -t grpc_clang_format \ + ls -l $MOUNTPOINT +#docker run --rm=true -v $OUTPUT_DIR:$MOUNTPOINT -t grpc_clang_format \ # clang-format-3.6 -style="{BasedOnStyle: Google, Language: Cpp}" \ -# -i /local/load_balancer.pb.c /local/load_balancer.pb.h +# -i $MOUNTPOINT/load_balancer.pb.c $MOUNTPOINT/load_balancer.pb.h popd > /dev/null diff --git a/tools/distrib/check_nanopb_output.sh b/tools/distrib/check_nanopb_output.sh index d6d34e3c40..6135800ac8 100755 --- a/tools/distrib/check_nanopb_output.sh +++ b/tools/distrib/check_nanopb_output.sh @@ -30,9 +30,9 @@ set -ex -apt-get install -y autoconf automake libtool curl virtualenv +apt-get install -y autoconf automake libtool curl python-virtualenv -readonly NANOPB_TMP_OUTPUT=$(mktemp -d) +readonly NANOPB_TMP_OUTPUT="${HOST_GIT_ROOT}/gens/src/proto/grpc/lb/v0" readonly VENV_DIR=$(mktemp -d) # create a virtualenv for nanopb's compiler pushd $VENV_DIR |