diff --git a/tools/ci_build/install/bazel.sh b/tools/ci_build/install/bazel.sh new file mode 100644 index 0000000000..dd3a9e08c4 --- /dev/null +++ b/tools/ci_build/install/bazel.sh @@ -0,0 +1,8 @@ +set -e +export WORKDIR=$(pwd) +mkdir /tmp/tf_addons_84d6d48 +cd /tmp/tf_addons_84d6d48 +git clone https://github.com/abhinavsingh/setup-bazel.git +bash ./setup-bazel/setup-bazel.sh 1.1.0 +rm -rf /tmp/tf_addons_84d6d48 +cd "$WORKDIR" diff --git a/tools/docker/cpu_tests.Dockerfile b/tools/docker/cpu_tests.Dockerfile index 1e0b760117..8209cf9e1d 100644 --- a/tools/docker/cpu_tests.Dockerfile +++ b/tools/docker/cpu_tests.Dockerfile @@ -3,8 +3,8 @@ FROM python:3.5 RUN pip install tensorflow-cpu==2.1.0 RUN apt-get update && apt-get install sudo -RUN git clone https://github.com/abhinavsingh/setup-bazel.git -RUN bash ./setup-bazel/setup-bazel.sh 1.1.0 +COPY tools/ci_build/install/bazel.sh ./ +RUN bash bazel.sh COPY requirements.txt ./ RUN pip install -r requirements.txt diff --git a/tools/docker/sanity_check.Dockerfile b/tools/docker/sanity_check.Dockerfile index d96e9c68a3..437afd1ef7 100644 --- a/tools/docker/sanity_check.Dockerfile +++ b/tools/docker/sanity_check.Dockerfile @@ -40,8 +40,8 @@ FROM python:3.5 as valid_build_files RUN pip install tensorflow-cpu==2.1.0 RUN apt-get update && apt-get install sudo -RUN git clone https://github.com/abhinavsingh/setup-bazel.git -RUN bash ./setup-bazel/setup-bazel.sh 1.1.0 +COPY tools/ci_build/install/bazel.sh ./ +RUN bash bazel.sh COPY ./ /addons WORKDIR /addons @@ -69,9 +69,8 @@ RUN touch /ok.txt # Bazel code format FROM alpine:3.11 as check-bazel-format -RUN wget -O /usr/local/bin/buildifier \ - https://github.com/bazelbuild/buildtools/releases/download/0.29.0/buildifier -RUN chmod +x /usr/local/bin/buildifier +COPY ./tools/ci_build/install/buildifier.sh ./ +RUN sh buildifier.sh COPY ./ /addons RUN buildifier -mode=check -r /addons