Move cleanup code to configure.sh

Dockerfile

@@ -15,32 +15,7 @@ COPY . ./
 RUN bash configure.sh install
 
 # Clean Superbuild
-RUN rm -rf \
-  /code/SuperBuild/build/opencv \
-  /code/SuperBuild/download \
-  /code/SuperBuild/src/ceres \
-  /code/SuperBuild/src/untwine \
-  /code/SuperBuild/src/entwine \
-  /code/SuperBuild/src/gflags \
-  /code/SuperBuild/src/hexer \
-  /code/SuperBuild/src/lastools \
-  /code/SuperBuild/src/laszip \
-  /code/SuperBuild/src/mvstexturing \
-  /code/SuperBuild/src/opencv \
-  /code/SuperBuild/src/opengv \
-  /code/SuperBuild/src/pcl \
-  /code/SuperBuild/src/pdal \
-  /code/SuperBuild/src/openmvs \
-  /code/SuperBuild/build/openmvs \
-  /code/SuperBuild/src/vcg \
-  /code/SuperBuild/src/zstd
-
-# find in /code and delete...
-RUN find /code \
-# ...*static* libraries...
-  -type f -name "*.a" -delete \
-# ...and intermediate object files
-  -or -type f -name "*.o" -delete
+RUN bash configure.sh clean
 
 ### END Builder
 

configure.sh

@@ -165,6 +165,32 @@ reinstall() {
     uninstall
     install
 }
+
+clean() {
+    rm -rf \
+        ${RUNPATH}/SuperBuild/build/opencv \
+        ${RUNPATH}/SuperBuild/download \
+        ${RUNPATH}/SuperBuild/src/ceres \
+        ${RUNPATH}/SuperBuild/src/untwine \
+        ${RUNPATH}/SuperBuild/src/entwine \
+        ${RUNPATH}/SuperBuild/src/gflags \
+        ${RUNPATH}/SuperBuild/src/hexer \
+        ${RUNPATH}/SuperBuild/src/lastools \
+        ${RUNPATH}/SuperBuild/src/laszip \
+        ${RUNPATH}/SuperBuild/src/mvstexturing \
+        ${RUNPATH}/SuperBuild/src/opencv \
+        ${RUNPATH}/SuperBuild/src/opengv \
+        ${RUNPATH}/SuperBuild/src/pcl \
+        ${RUNPATH}/SuperBuild/src/pdal \
+        ${RUNPATH}/SuperBuild/src/openmvs \
+        ${RUNPATH}/SuperBuild/build/openmvs \
+        ${RUNPATH}/SuperBuild/src/vcg \
+        ${RUNPATH}/SuperBuild/src/zstd
+
+    # find in /code and delete static libraries and intermediate object files
+    find ${RUNPATH} -type f -name "*.a" -delete -or -type f -name "*.o" -delete
+}
+
 usage() {
     echo "Usage:"
     echo "bash configure.sh <install|update|uninstall|help> [nproc]"
@@ -177,12 +203,14 @@ usage() {
     echo "    Removes SuperBuild and build modules, then re-installs them. Note this does not update OpenDroneMap to the latest version. "
     echo "  uninstall"
     echo "    Removes SuperBuild and build modules. Does not uninstall dependencies"
+    echo "  clean"
+    echo "    Cleans the SuperBuild directory by removing temporary files. "
     echo "  help"
     echo "    Displays this message"
     echo "[nproc] is an optional argument that can set the number of processes for the make -j tag. By default it uses $(nproc)"
 }
 
-if [[ $1 =~ ^(install|installruntimedepsonly|reinstall|uninstall)$ ]]; then
+if [[ $1 =~ ^(install|installruntimedepsonly|reinstall|uninstall|clean)$ ]]; then
     RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
     "$1"
 else

portable.Dockerfile

@@ -15,32 +15,7 @@ COPY . ./
 RUN PORTABLE_INSTALL=YES bash configure.sh install
 
 # Clean Superbuild
-RUN rm -rf \
-  /code/SuperBuild/build/opencv \
-  /code/SuperBuild/download \
-  /code/SuperBuild/src/ceres \
-  /code/SuperBuild/src/untwine \
-  /code/SuperBuild/src/entwine \  
-  /code/SuperBuild/src/gflags \
-  /code/SuperBuild/src/hexer \
-  /code/SuperBuild/src/lastools \
-  /code/SuperBuild/src/laszip \
-  /code/SuperBuild/src/mvstexturing \
-  /code/SuperBuild/src/opencv \
-  /code/SuperBuild/src/opengv \
-  /code/SuperBuild/src/pcl \
-  /code/SuperBuild/src/pdal \
-  /code/SuperBuild/src/openmvs \
-  /code/SuperBuild/build/openmvs \
-  /code/SuperBuild/src/vcg \
-  /code/SuperBuild/src/zstd
-
-# find in /code and delete...
-RUN find /code \
-# ...*static* libraries...
-  -type f -name "*.a" -delete \
-# ...and intermediate object files
-  -or -type f -name "*.o" -delete
+RUN bash configure.sh clean
 
 ### END Builder