From 70356127cc88298ca5174829ad988980ecacc139 Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Thu, 24 Dec 2020 08:08:26 -0800 Subject: [PATCH 1/4] * Install bazelisk in image --- tools/docker/build_wheel.Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/docker/build_wheel.Dockerfile b/tools/docker/build_wheel.Dockerfile index 30fab3642f..8c74f6aa40 100644 --- a/tools/docker/build_wheel.Dockerfile +++ b/tools/docker/build_wheel.Dockerfile @@ -23,10 +23,12 @@ RUN python -m pip install --default-timeout=1000 tensorflow==$TF_VERSION COPY tools/install_deps/ /install_deps RUN python -m pip install -r /install_deps/pytest.txt +RUN bash /install_deps/install_bazelisk.sh ./ COPY requirements.txt . RUN python -m pip install -r requirements.txt + COPY ./ /addons WORKDIR /addons From 7dca2dc313828391f6cdacef9a0bee019fbd80fd Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Thu, 24 Dec 2020 08:11:36 -0800 Subject: [PATCH 2/4] * Install bazelisk in image --- tools/docker/build_wheel.Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/docker/build_wheel.Dockerfile b/tools/docker/build_wheel.Dockerfile index 8c74f6aa40..047633cfe8 100644 --- a/tools/docker/build_wheel.Dockerfile +++ b/tools/docker/build_wheel.Dockerfile @@ -28,7 +28,6 @@ RUN bash /install_deps/install_bazelisk.sh ./ COPY requirements.txt . RUN python -m pip install -r requirements.txt - COPY ./ /addons WORKDIR /addons From d49d4d58a050c5b963fd099fa449946deb2c9db8 Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Mon, 28 Dec 2020 07:41:53 -0800 Subject: [PATCH 3/4] * Debug --- .bazelversion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bazelversion b/.bazelversion index fd2a01863f..0b2eb36f50 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -3.1.0 +3.7.2 From e56acc5997be27730333928d952eafe7a85f3cb4 Mon Sep 17 00:00:00 2001 From: Sean Morgan Date: Mon, 28 Dec 2020 19:52:43 -0800 Subject: [PATCH 4/4] * Remove bazelversion in container --- tools/docker/build_wheel.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/build_wheel.Dockerfile b/tools/docker/build_wheel.Dockerfile index 047633cfe8..7a0b8e9116 100644 --- a/tools/docker/build_wheel.Dockerfile +++ b/tools/docker/build_wheel.Dockerfile @@ -23,12 +23,12 @@ RUN python -m pip install --default-timeout=1000 tensorflow==$TF_VERSION COPY tools/install_deps/ /install_deps RUN python -m pip install -r /install_deps/pytest.txt -RUN bash /install_deps/install_bazelisk.sh ./ COPY requirements.txt . RUN python -m pip install -r requirements.txt COPY ./ /addons +RUN rm /addons/.bazelversion WORKDIR /addons # -------------------------------------------------------------------