Skip to content
Snippets Groups Projects
Commit 9508a420 authored by David Garcia Quintas's avatar David Garcia Quintas
Browse files

trying to fix docker once again...

parent 366c531f
No related branches found
No related tags found
No related merge requests found
......@@ -124,13 +124,10 @@ mv -v $TMPFILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.c"
cat $COPYRIGHT_FILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.h" > $TMPFILE
mv -v $TMPFILE "$OUTPUT_DIR/$PROTO_BASENAME.pb.h"
ls -l $OUTPUT_DIR
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 $MOUNTPOINT/load_balancer.pb.c $MOUNTPOINT/load_balancer.pb.h
docker run --rm=true -v ${HOST_GIT_ROOT}/gens/src/proto/grpc/lb/v0:$MOUNTPOINT \
-t grpc_clang_format \
clang-format-3.6 -style="{BasedOnStyle: Google, Language: Cpp}" \
-i $MOUNTPOINT/load_balancer.pb.c $MOUNTPOINT/load_balancer.pb.h
popd > /dev/null
......@@ -32,7 +32,7 @@ set -ex
apt-get install -y autoconf automake libtool curl python-virtualenv
readonly NANOPB_TMP_OUTPUT="${HOST_GIT_ROOT}/gens/src/proto/grpc/lb/v0"
readonly NANOPB_TMP_OUTPUT="${LOCAL_GIT_ROOT}/gens/src/proto/grpc/lb/v0"
readonly VENV_DIR=$(mktemp -d)
# create a virtualenv for nanopb's compiler
pushd $VENV_DIR
......
......@@ -60,6 +60,9 @@ docker build -t $DOCKER_IMAGE_NAME $DOCKERFILE_DIR
# Choose random name for docker container
CONTAINER_NAME="run_tests_$(uuidgen)"
# Git root as seen by the docker instance
docker_instance_git_root=/var/local/jenkins/grpc
# Run tests inside docker
docker run \
-e "RUN_TESTS_COMMAND=$RUN_TESTS_COMMAND" \
......@@ -69,9 +72,10 @@ docker run \
-e XDG_CACHE_HOME=/tmp/xdg-cache-home \
-e THIS_IS_REALLY_NEEDED='see https://github.com/docker/docker/issues/14203 for why docker is awful' \
-e HOST_GIT_ROOT=$git_root \
-e LOCAL_GIT_ROOT=$docker_instance_git_root \
-e "BUILD_ID=$BUILD_ID" \
-i $TTY_FLAG \
-v "$git_root:/var/local/jenkins/grpc" \
-v "$git_root:$docker_instance_git_root" \
-v /tmp/ccache:/tmp/ccache \
-v /tmp/npm-cache:/tmp/npm-cache \
-v /tmp/xdg-cache-home:/tmp/xdg-cache-home \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment