[MINOR] Improve Docker Image Stability

This commit updates the docker images for systemds
to use a consistent base and build sequence to enable
caching of image parts. This caching avoid an 30 minute build time
to update the test entrypoint script for GitHub action test updates.

Author: Baunsgaard

docker/entrypoint.sh

@@ -32,6 +32,10 @@ log="/tmp/sysdstest.log"
 mvn -ntp -B test-compile 2>&1 | grep -E "BUILD|Total time:|---|Building SystemDS"
 mvn -ntp -B test -D maven.test.skip=false -D automatedtestbase.outputbuffering=true -D test=$1 2>&1 | grep -v "already exists in destination." | tee $log
 
+# Merge Federated test runs.
+[ -f target/jacoco.exec ] && mv target/jacoco.exec target/jacoco_main.exec
+mvn -ntp -B jacoco:merge
+
 grep_args="SUCCESS"
 grepvals="$( tail -n 100 $log | grep $grep_args)"
 

docker/sysds.Dockerfile

@@ -19,7 +19,7 @@
 #
 #-------------------------------------------------------------
 
-FROM ubuntu:24.04
+FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
 
 WORKDIR /usr/src/
 

docker/testsysds.Dockerfile

@@ -19,8 +19,7 @@
 #
 #-------------------------------------------------------------
 
-FROM ubuntu:24.04
-
+FROM ubuntu:24.04@sha256:6015f66923d7afbc53558d7ccffd325d43b4e249f41a6e93eef074c9505d2233
 
 WORKDIR /usr/src/
 ENV MAVEN_VERSION=3.9.9
@@ -34,9 +33,6 @@ ENV LC_ALL=en_US.UTF-8
 ENV LANG=en_US.UTF-8
 ENV LD_LIBRARY_PATH=/usr/local/lib/
 
-COPY ./src/test/scripts/installDependencies.R installDependencies.R
-COPY ./docker/entrypoint.sh /entrypoint.sh
-
 RUN apt-get update -qq \
 	&& apt-get upgrade -y \
 	&& apt-get install -y --no-install-recommends \
@@ -74,7 +70,9 @@ RUN apt-get install -y --no-install-recommends \
 		r-base-dev \
 		r-base-core
 
+
 # Install R packages
+COPY ./src/test/scripts/installDependencies.R installDependencies.R		
 RUN Rscript installDependencies.R \
 	&& rm -rf installDependencies.R \
 	&& rm -rf /var/lib/apt/lists/*
@@ -86,4 +84,9 @@ RUN wget -qO- https://github.com/microsoft/SEAL/archive/refs/tags/v3.7.0.tar.gz
     && cmake --build build \
     && cmake --install build
 
+# Finally copy the entrypoint script
+# This is last to enable quick updates to the script after initial local build.
+COPY ./docker/entrypoint.sh /entrypoint.sh
+
+
 ENTRYPOINT ["/entrypoint.sh"]