Make Arch CUDA image smaller

FloopCZ · Mar 16, 2020 · e751f69 · e751f69
1 parent 42dc92d
commit e751f69
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/Dockerfiles/archlinux b/Dockerfiles/archlinux
@@ -6,4 +6,4 @@ COPY . tensorflow_cc
 # RUN git clone https://github.com/FloopCZ/tensorflow_cc.git
 
 # build and install
-RUN ./tensorflow_cc/Dockerfiles/install-archlinux.sh --shared
+RUN ./tensorflow_cc/Dockerfiles/install-archlinux.sh
diff --git a/Dockerfiles/archlinux-cuda b/Dockerfiles/archlinux-cuda
@@ -6,7 +6,7 @@ COPY . tensorflow_cc
 # RUN git clone https://github.com/FloopCZ/tensorflow_cc.git
 
 # build and install
-RUN ./tensorflow_cc/Dockerfiles/install-archlinux.sh --cuda --shared
+RUN ./tensorflow_cc/Dockerfiles/install-archlinux.sh --cuda
 
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility

diff --git a/Dockerfiles/install-archlinux.sh b/Dockerfiles/install-archlinux.sh
@@ -24,7 +24,7 @@ pacman -Syu --noconfirm --needed \
   wget
 
 pacman -S --noconfirm --needed \
-  java-environment=8 \
+  jdk11-openjdk \
   libarchive \
   protobuf \
   unzip \
@@ -41,6 +41,7 @@ if $cuda; then
       cuda \
       cudnn \
       nccl
+    source /etc/profile.d/cuda.sh
 fi
 
 # when building TF with Intel MKL support, `locate` database needs to exist
@@ -54,4 +55,15 @@ if $cuda; then
     rm -vf /usr/bin/nvidia*
     rm -vf /usr/lib/libnvidia*
     rm -vf /usr/lib/libcuda*
+    rm -rvf /opt/cuda/doc/
+    rm -rvf /opt/cuda/extras/
+    rm -rvf /opt/cuda/*nsight*
+    rm -rvf /opt/cuda/*nvvp*
+    rm -rvf /opt/cuda/samples/
 fi
+
+# cleanup packages
+rm -rvf /usr/local/lib/bazel/
+rm -vf /usr/local/bin/bazel
+pacman --noconfirm -R jdk11-openjdk python python-numpy
+pacman --noconfirm -Rns $(pacman -Qtdq)
diff --git a/Dockerfiles/ubuntu b/Dockerfiles/ubuntu
@@ -6,4 +6,4 @@ COPY . tensorflow_cc
 # RUN git clone https://github.com/FloopCZ/tensorflow_cc.git
 
 # build and install
-RUN ./tensorflow_cc/Dockerfiles/install-ubuntu.sh --shared
+RUN ./tensorflow_cc/Dockerfiles/install-ubuntu.sh
diff --git a/Dockerfiles/ubuntu-cuda b/Dockerfiles/ubuntu-cuda
@@ -9,5 +9,5 @@ COPY . tensorflow_cc
 # temporarily use the CUDA stubs, the real libraries will be provided by nvidia-docker
 RUN ln -s /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/stubs/libcuda.so.1 \
   && LD_LIBRARY_PATH=/usr/local/cuda/lib64/stubs/:$LD_LIBRARY_PATH \
-    ./tensorflow_cc/Dockerfiles/install-ubuntu.sh --shared --cuda \
+    ./tensorflow_cc/Dockerfiles/install-ubuntu.sh --cuda \
   && rm /usr/local/cuda/lib64/stubs/libcuda.so.1