From 9258267f45b826ab800d4585159d1e161f3bc19a Mon Sep 17 00:00:00 2001 From: Leandro Nunes Date: Wed, 28 Jul 2021 10:51:23 +0100 Subject: [PATCH] Disable pip cache when creating Docker images * This is a good practice to save storage space in the Docker images being created * Also sort pip package lists alphabetically --- docker/Dockerfile.ci_arm | 3 +++ docker/Dockerfile.ci_cpu | 3 +++ docker/Dockerfile.ci_gpu | 3 +++ docker/Dockerfile.ci_i386 | 3 +++ docker/Dockerfile.ci_lint | 3 +++ docker/Dockerfile.ci_qemu | 3 +++ docker/Dockerfile.ci_wasm | 3 +++ docker/install/ubuntu_install_darknet.sh | 5 ++++- docker/install/ubuntu_install_onnx.sh | 9 ++++++--- .../install/ubuntu_install_python_package.sh | 19 ++++++++++++++++++- docker/install/ubuntu_install_redis.sh | 4 +++- docker/install/ubuntu_install_sphinx.sh | 11 ++++++++++- docker/install/ubuntu_install_tensorflow.sh | 5 ++++- 13 files changed, 66 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm index 9479d7194d3b..debc81c724c2 100644 --- a/docker/Dockerfile.ci_arm +++ b/docker/Dockerfile.ci_arm @@ -23,6 +23,9 @@ 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 diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 65afa6931d9c..ccf88bd0c374 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -21,6 +21,9 @@ 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 diff --git a/docker/Dockerfile.ci_gpu b/docker/Dockerfile.ci_gpu index 09c6425da6fb..7335ec884171 100644 --- a/docker/Dockerfile.ci_gpu +++ b/docker/Dockerfile.ci_gpu @@ -22,6 +22,9 @@ 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 diff --git a/docker/Dockerfile.ci_i386 b/docker/Dockerfile.ci_i386 index 2383f4675e37..7b7d695673f5 100644 --- a/docker/Dockerfile.ci_i386 +++ b/docker/Dockerfile.ci_i386 @@ -22,6 +22,9 @@ 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 diff --git a/docker/Dockerfile.ci_lint b/docker/Dockerfile.ci_lint index 2adb793a3517..27df66cf5851 100644 --- a/docker/Dockerfile.ci_lint +++ b/docker/Dockerfile.ci_lint @@ -22,6 +22,9 @@ 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 diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu index 104c86c7d871..ed744aa14ce4 100644 --- a/docker/Dockerfile.ci_qemu +++ b/docker/Dockerfile.ci_qemu @@ -21,6 +21,9 @@ 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 diff --git a/docker/Dockerfile.ci_wasm b/docker/Dockerfile.ci_wasm index 85f942d57ca3..5590deb7b497 100644 --- a/docker/Dockerfile.ci_wasm +++ b/docker/Dockerfile.ci_wasm @@ -18,6 +18,9 @@ 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 diff --git a/docker/install/ubuntu_install_darknet.sh b/docker/install/ubuntu_install_darknet.sh index 37adf4a30270..8020899f8bf1 100755 --- a/docker/install/ubuntu_install_darknet.sh +++ b/docker/install/ubuntu_install_darknet.sh @@ -23,4 +23,7 @@ set -o pipefail #install the necessary dependancies, cffi, opencv wget -q 'https://github.com/siju-samuel/darknet/blob/master/lib/libdarknet.so?raw=true' -O libdarknet.so debian_version=`cat /etc/debian_version` -pip3 install opencv-python cffi + +pip3 install \ + cffi \ + opencv-python diff --git a/docker/install/ubuntu_install_onnx.sh b/docker/install/ubuntu_install_onnx.sh index 8f462284c2ba..ef0bf1b012c6 100755 --- a/docker/install/ubuntu_install_onnx.sh +++ b/docker/install/ubuntu_install_onnx.sh @@ -22,11 +22,14 @@ set -o pipefail # We need to fix the onnx version because changing versions tends to break tests # TODO(mbrookhart): periodically update -pip3 install onnx==1.8.1 -pip3 install onnxruntime==1.7.0 +pip3 install \ + onnx==1.8.1 \ + onnxruntime==1.7.0 # torch depends on a number of other packages, but unhelpfully, does # not expose that in the wheel!!! pip3 install future -pip3 install torch==1.7.0 torchvision==0.8.1 +pip3 install \ + torch==1.7.0 \ + torchvision==0.8.1 diff --git a/docker/install/ubuntu_install_python_package.sh b/docker/install/ubuntu_install_python_package.sh index 7989a49a4826..2ca298a43857 100755 --- a/docker/install/ubuntu_install_python_package.sh +++ b/docker/install/ubuntu_install_python_package.sh @@ -21,4 +21,21 @@ set -u set -o pipefail # install libraries for python package on ubuntu -pip3 install six numpy pytest cython decorator scipy tornado pytest pytest-xdist pytest-profiling mypy orderedset attrs requests Pillow packaging cloudpickle synr +pip3 install \ + attrs \ + cloudpickle \ + cython \ + decorator \ + mypy \ + numpy \ + orderedset \ + packaging \ + Pillow \ + pytest \ + pytest-profiling \ + pytest-xdist \ + requests \ + scipy \ + six \ + synr \ + tornado diff --git a/docker/install/ubuntu_install_redis.sh b/docker/install/ubuntu_install_redis.sh index 0eb46eb8edec..d2600d828d49 100755 --- a/docker/install/ubuntu_install_redis.sh +++ b/docker/install/ubuntu_install_redis.sh @@ -21,4 +21,6 @@ set -u set -o pipefail apt-get update && apt-get install -y redis-server -pip3 install "xgboost>=1.1.0" psutil +pip3 install \ + psutil \ + "xgboost>=1.1.0" diff --git a/docker/install/ubuntu_install_sphinx.sh b/docker/install/ubuntu_install_sphinx.sh index 8a7ce1d3f798..12208bbe6643 100755 --- a/docker/install/ubuntu_install_sphinx.sh +++ b/docker/install/ubuntu_install_sphinx.sh @@ -21,4 +21,13 @@ set -u set -o pipefail # NOTE: install docutils < 0.17 to work around https://github.com/readthedocs/sphinx_rtd_theme/issues/1115 -pip3 install sphinx sphinx-gallery==0.4.0 autodocsumm sphinx_rtd_theme sphinx_autodoc_annotation matplotlib Image "commonmark>=0.7.3" "docutils>=0.11,<0.17" +pip3 install \ + autodocsumm \ + "commonmark>=0.7.3" \ + "docutils>=0.11,<0.17" \ + Image \ + matplotlib \ + sphinx \ + sphinx_autodoc_annotation \ + sphinx-gallery==0.4.0 \ + sphinx_rtd_theme diff --git a/docker/install/ubuntu_install_tensorflow.sh b/docker/install/ubuntu_install_tensorflow.sh index 0e14c724ae3e..8a51fbbbb178 100755 --- a/docker/install/ubuntu_install_tensorflow.sh +++ b/docker/install/ubuntu_install_tensorflow.sh @@ -20,4 +20,7 @@ set -e set -u set -o pipefail -pip3 install tensorflow==2.4.2 keras==2.4.3 "h5py<3.0" +pip3 install \ + "h5py<3.0" \ + keras==2.4.3 \ + tensorflow==2.4.2