+ 4e62856

docker/Dockerfile

@@ -9,13 +9,13 @@ USER root
 # Build & install everything
 WORKDIR /tmp
 ENV DEBIAN_FRONTEND=noninteractive
+RUN --mount=type=cache,target=/var/cache/apt
 ARG APT_UPDATE="apt-get update"
 RUN ${APT_UPDATE}
 ARG APT_UPGRADE="apt-get upgrade -y"
 RUN ${APT_UPGRADE}
 ARG APT_INSTALL="apt-get install --no-install-recommends -y"
-ARG APT_CLEAN="apt-get clean"
-RUN ${APT_INSTALL} lsb-release ca-certificates && ${APT_CLEAN}
+RUN ${APT_INSTALL} lsb-release ca-certificates
 COPY docker/install_conda.sh .
 RUN ./install_conda.sh
 COPY docker/setup_conda.sh .

docker/install_conda.sh

@@ -12,6 +12,5 @@ ${APT_UPDATE}
 ${APT_INSTALL} conda
 . /opt/conda/etc/profile.d/conda.sh
 conda update conda
-${APT_CLEAN}
 rm -r ~/.cache
 mkdir ~/.cache

docker/install_hw.sh

@@ -22,7 +22,6 @@ intel)
   ${PIP_INSTALL} torch==2.1.0.post2 torchvision==0.16.0.post2 torchaudio==2.1.0.post2 \
    intel-extension-for-pytorch==2.1.30.post0 oneccl_bind_pt==2.1.300+xpu \
    --extra-index-url https://pytorch-extension.intel.com/release-whl/stable/xpu/us/
-  find "/opt/conda" -name libstdc++.so.6 -delete
   printf "/opt/intel/oneapi/mkl/2024.1/lib\n/opt/intel/oneapi/compiler/2024.1/lib\n" > \
    /etc/ld.so.conf.d/zzz-intel-oneapi.conf
   ldconfig
@@ -33,7 +32,5 @@ intel)
   ;;
 esac
 
-apt-get autoremove -y
-${APT_CLEAN}
 rm -r ~/.cache
 mkdir ~/.cache

docker/install_requirements.sh

@@ -20,10 +20,10 @@ if [ "${INFER_HW}" = "intel" ]
 then
   patch -d "/opt/conda/envs/${CONDA_MAINENV}/lib/python${PYTHON_VER}/site-packages" \
    -p2 -s < intel-ray.diff
+  find "/opt/conda" -name "libstdc++.so.6" -delete
 fi
 
 apt-get remove -y ${DEV_PKGS}
 apt-get autoremove -y
-${APT_CLEAN}
 rm -r ~/.cache
 mkdir ~/.cache