refactor Dockerfiles

jameslamb · Dec 31, 2024 · 225a7a5 · 225a7a5
1 parent eeaf048
commit 225a7a5
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 48 deletions.
diff --git a/Dockerfile-cluster b/Dockerfile-cluster
@@ -1,12 +1,15 @@
 ARG BASE_IMAGE=unset
-ARG INSTALL_DIR=/opt/LightGBM
 
 # hadolint ignore=DL3006
 FROM ${BASE_IMAGE}
 
-COPY LightGBM/ ${INSTALL_DIR}/
+RUN --mount=type=bind,source=LightGBM,target=/tmp/LightGBM \
+<<EOF
+cd /tmp/LightGBM
 
-RUN cd "${INSTALL_DIR}" && \
-    sh ./build-python.sh install --precompile && \
-    cd /opt && \
-    rm -rf "${INSTALL_DIR}"
+# build lightgbm package, install to site-packages/
+sh ./build-python.sh install --precompile
+
+# clear pip's cache
+rm -rf ~/.cache
+EOF
diff --git a/Dockerfile-cluster-base b/Dockerfile-cluster-base
@@ -39,23 +39,31 @@ find \
     /usr/local/lib/python${PYTHON_VERSION}/site-packages \
     -type f \
     \( \
-    -name '*.c' \
-    -o -name '*.cc' \
-    -o -name '*.cpp' \
-    -o -name '*.h' \
-    -o -name '*.hpp' \
-    -o -wholename '*bokeh/sampledata/*' \
-    -o -wholename '*dask/*tests/*' \
-    -o -wholename '*joblib/test/*' \
-    -o -wholename '*llvmlite/tests/*' \
-    -o -wholename '*numba/*tests/*' \
-    -o -wholename '*numpy/*tests/*' \
-    -o -wholename '*pandas/*tests/*' \
-    -o -wholename '*scikit-learn/tests*' \
-    -o -wholename '*scikit-learn/*/tests*' \
-    -o -wholename '*scipy/*/tests*' \
-    -o -wholename '*tornado/test/*' \
-    -o -wholename '*/__pycache__/*' \
+    -name '*.c'                                 \
+    -o -name '*.cc'                             \
+    -o -name '*.cpp'                            \
+    -o -name '*.h'                              \
+    -o -name '*.hpp'                            \
+    -o -wholename '*bokeh/sampledata/*'         \
+    -o -wholename '*dask/*tests/*'              \
+    -o -wholename '*joblib/test/*'              \
+    -o -wholename '*llvmlite/tests/*'           \
+    -o -wholename '*numba/*tests/*'             \
+    -o -wholename '*numpy/*tests/*'             \
+    -o -wholename '*pandas/tests*'              \
+    -o -wholename '*pandas/*/tests/*'           \
+    -o -wholename '*psutil/tests/*'             \
+    -o -wholename 'pyarrow/_pyarrow_cpp_tests*' \
+    -o -wholename '*scikit-learn/tests*'        \
+    -o -wholename '*scikit-learn/*/tests*'      \
+    -o -wholename '*sklearn/tests*'             \
+    -o -wholename '*sklearn/*/tests*'           \
+    -o -wholename '*scipy/*/tests*'             \
+    -o -wholename '*sparse/*/tests/*'           \
+    -o -wholename '*toolz/tests/*'              \
+    -o -wholename '*tornado/test/*'             \
+    -o -wholename '*zict/tests/*'               \
+    -o -wholename '*/__pycache__/*'             \
     \) \
     -exec rm '{}' '+'
 
@@ -67,5 +75,9 @@ find \
 
 # clean apt-get files
 apt-get clean
+apt-get purge -y --auto-remove
 rm -rf /var/lib/apt/lists/*
+
+# clean other files
+rm -rf ~/.cache
 EOF
diff --git a/Dockerfile-notebook b/Dockerfile-notebook
@@ -1,15 +1,19 @@
 ARG BASE_IMAGE=unset
-ARG INSTALL_DIR=/root/testing/LightGBM
 
 # hadolint ignore=DL3006
 FROM ${BASE_IMAGE}
 
 COPY jupyter_notebook_config.py /root/.jupyter/jupyter_notebook_config.py
-COPY LightGBM/ ${INSTALL_DIR}/
 
-RUN cd "${INSTALL_DIR}" && \
-    sh ./build-python.sh install --precompile && \
-    cd /root/ && \
-    rm -rf "${INSTALL_DIR}"
+RUN --mount=type=bind,source=LightGBM,target=/tmp/LightGBM \
+<<EOF
+cd /tmp/LightGBM
+
+# build lightgbm package, install to site-packages/
+sh ./build-python.sh install --precompile
+
+# clear pip's cache
+rm -rf ~/.cache
+EOF
 
 WORKDIR /root/testing/notebooks
diff --git a/Dockerfile-notebook-base b/Dockerfile-notebook-base
@@ -43,23 +43,31 @@ find \
     /usr/local/lib/python${PYTHON_VERSION}/site-packages \
     -type f \
     \( \
-    -name '*.c' \
-    -o -name '*.cc' \
-    -o -name '*.cpp' \
-    -o -name '*.h' \
-    -o -name '*.hpp' \
-    -o -wholename '*bokeh/sampledata/*' \
-    -o -wholename '*dask/*tests/*' \
-    -o -wholename '*joblib/test/*' \
-    -o -wholename '*llvmlite/tests/*' \
-    -o -wholename '*numba/*tests/*' \
-    -o -wholename '*numpy/*tests/*' \
-    -o -wholename '*pandas/*tests/*' \
-    -o -wholename '*scikit-learn/tests*' \
-    -o -wholename '*scikit-learn/*/tests*' \
-    -o -wholename '*scipy/*/tests*' \
-    -o -wholename '*tornado/test/*' \
-    -o -wholename '*/__pycache__/*' \
+    -name '*.c'                                 \
+    -o -name '*.cc'                             \
+    -o -name '*.cpp'                            \
+    -o -name '*.h'                              \
+    -o -name '*.hpp'                            \
+    -o -wholename '*bokeh/sampledata/*'         \
+    -o -wholename '*dask/*tests/*'              \
+    -o -wholename '*joblib/test/*'              \
+    -o -wholename '*llvmlite/tests/*'           \
+    -o -wholename '*numba/*tests/*'             \
+    -o -wholename '*numpy/*tests/*'             \
+    -o -wholename '*pandas/tests*'              \
+    -o -wholename '*pandas/*/tests/*'           \
+    -o -wholename '*psutil/tests/*'             \
+    -o -wholename 'pyarrow/_pyarrow_cpp_tests*' \
+    -o -wholename '*scikit-learn/tests*'        \
+    -o -wholename '*scikit-learn/*/tests*'      \
+    -o -wholename '*sklearn/tests*'             \
+    -o -wholename '*sklearn/*/tests*'           \
+    -o -wholename '*scipy/*/tests*'             \
+    -o -wholename '*sparse/*/tests/*'           \
+    -o -wholename '*toolz/tests/*'              \
+    -o -wholename '*tornado/test/*'             \
+    -o -wholename '*zict/tests/*'               \
+    -o -wholename '*/__pycache__/*'             \
     \) \
     -exec rm '{}' '+'
 
@@ -71,7 +79,11 @@ find \
 
 # clean apt-get files
 apt-get clean
+apt-get purge -y --auto-remove
 rm -rf /var/lib/apt/lists/*
+
+# clean other files
+rm -rf ~/.cache
 EOF
 
 ENTRYPOINT ["jupyter", "lab", "--ip=0.0.0.0", "--allow-root", "--port=8888"]
diff --git a/bin/install-cmake b/bin/install-cmake
@@ -4,12 +4,17 @@ set -e -u -o pipefail
 
 CMAKE_VERSION=${1}
 
+declare -r install_script
+install_script="cmake-${CMAKE_VERSION}-linux-$(arch).sh"
+
 curl -O -L \
-    "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-$(arch).sh"
+    "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${install_script}"
 
 mkdir /opt/cmake
-sh "cmake-${CMAKE_VERSION}-linux-$(arch).sh" \
+sh "${install_script}" \
     --skip-license \
     --prefix=/opt/cmake
 
+rm "./${install_script}"
+
 ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake