From a435857cb32302312ca0aa2724bfe97502df0101 Mon Sep 17 00:00:00 2001 From: Leandro Nunes Date: Mon, 2 Aug 2021 10:10:36 +0100 Subject: [PATCH] [CI] Fix global pip cache disable change (#8590) * The fix to disable cache needs to run after pip is installed * This is quick follow up fix after #8575 --- docker/Dockerfile.ci_arm | 6 +++--- docker/Dockerfile.ci_cpu | 6 +++--- docker/Dockerfile.ci_gpu | 6 +++--- docker/Dockerfile.ci_i386 | 6 +++--- docker/Dockerfile.ci_lint | 6 +++--- docker/Dockerfile.ci_qemu | 6 +++--- docker/Dockerfile.ci_wasm | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm index debc81c724c2..974998b9d6fe 100644 --- a/docker/Dockerfile.ci_arm +++ b/docker/Dockerfile.ci_arm @@ -23,9 +23,6 @@ FROM ubuntu:18.04 RUN apt-get update --fix-missing RUN apt-get install -y ca-certificates gnupg2 -# Globally disable pip cache -RUN pip config set global.cache-dir false - COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh @@ -35,6 +32,9 @@ RUN bash /install/ubuntu_install_llvm.sh COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh RUN bash /install/ubuntu1804_install_python.sh +# Globally disable pip cache +RUN pip config set global.cache-dir false + COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh RUN bash /install/ubuntu_install_cmake_source.sh diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 237a570a191a..07e798c4e615 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -21,15 +21,15 @@ FROM ubuntu:18.04 RUN apt-get update --fix-missing -# Globally disable pip cache -RUN pip config set global.cache-dir false - COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh RUN bash /install/ubuntu1804_install_python.sh +# Globally disable pip cache +RUN pip config set global.cache-dir false + COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh RUN bash /install/ubuntu_install_python_package.sh diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index 7335ec884171..a76cf4664f47 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -22,15 +22,15 @@ FROM nvidia/cuda:11.0.3-cudnn8-devel-ubuntu18.04 # Base scripts RUN apt-get update --fix-missing -# Globally disable pip cache -RUN pip config set global.cache-dir false - COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh RUN bash /install/ubuntu1804_install_python.sh +# Globally disable pip cache +RUN pip config set global.cache-dir false + COPY install/ubuntu1804_install_llvm.sh /install/ubuntu1804_install_llvm.sh RUN bash /install/ubuntu1804_install_llvm.sh diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386 index 7b7d695673f5..564731c12d36 100644 --- a/docker/Dockerfile.ci_i386 +++ b/docker/Dockerfile.ci_i386 @@ -22,9 +22,6 @@ FROM ioft/i386-ubuntu:16.04 RUN apt-get update --fix-missing && apt-get install -y ca-certificates -# Globally disable pip cache -RUN pip config set global.cache-dir false - COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh @@ -34,6 +31,9 @@ RUN bash /install/ubuntu_install_llvm.sh COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh RUN bash /install/ubuntu_install_python.sh +# Globally disable pip cache +RUN pip config set global.cache-dir false + COPY install/ubuntu_install_cmake_source.sh /install/ubuntu_install_cmake_source.sh RUN bash /install/ubuntu_install_cmake_source.sh diff --git a/docker/Dockerfile.ci_lint b/docker/Dockerfile.ci_lint index 27df66cf5851..ae8c6b0c2c16 100644 --- a/docker/Dockerfile.ci_lint +++ b/docker/Dockerfile.ci_lint @@ -22,14 +22,14 @@ FROM ubuntu:18.04 RUN apt-get update --fix-missing -# Globally disable pip cache -RUN pip config set global.cache-dir false - RUN apt-get update && apt-get install -y wget git sudo make COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh RUN bash /install/ubuntu1804_install_python.sh +# Globally disable pip cache +RUN pip config set global.cache-dir false + RUN apt-get update && apt-get install -y doxygen graphviz RUN pip3 install cpplint pylint==2.4.4 mypy==0.902 black==20.8b1 diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu index ed744aa14ce4..e309bb5f0e6c 100644 --- a/docker/Dockerfile.ci_qemu +++ b/docker/Dockerfile.ci_qemu @@ -21,9 +21,6 @@ FROM ubuntu:18.04 RUN apt-get update --fix-missing -# Globally disable pip cache -RUN pip config set global.cache-dir false - COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh @@ -31,6 +28,9 @@ COPY install/ubuntu1804_install_python_venv.sh /install/ubuntu1804_install_pytho RUN bash /install/ubuntu1804_install_python_venv.sh ENV PATH=/opt/tvm-venv/bin:/opt/zephyr-sdk/sysroots/x86_64-pokysdk-linux/usr/bin:$PATH +# Globally disable pip cache +RUN pip config set global.cache-dir false + COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh RUN bash /install/ubuntu_install_python_package.sh diff --git a/docker/Dockerfile.ci_wasm b/docker/Dockerfile.ci_wasm index 5590deb7b497..03a1ded5572f 100644 --- a/docker/Dockerfile.ci_wasm +++ b/docker/Dockerfile.ci_wasm @@ -18,15 +18,15 @@ FROM ubuntu:18.04 RUN apt-get update --fix-missing -# Globally disable pip cache -RUN pip config set global.cache-dir false - COPY install/ubuntu_install_core.sh /install/ubuntu_install_core.sh RUN bash /install/ubuntu_install_core.sh COPY install/ubuntu1804_install_python.sh /install/ubuntu1804_install_python.sh RUN bash /install/ubuntu1804_install_python.sh +# Globally disable pip cache +RUN pip config set global.cache-dir false + COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh RUN bash /install/ubuntu_install_python_package.sh