docker SEAL HE fixes

Author: Baunsgaard

.gitignore

@@ -154,3 +154,6 @@ scripts/resource/output
 # docker tests
 docker/mountFolder/*.bin
 docker/mountFolder/*.bin.mtd
+
+SEAL-*/
+

docker/entrypoint.sh

@@ -35,12 +35,10 @@ mvn -ntp -B test -D maven.test.skip=false -D automatedtestbase.outputbuffering=t
 	| grep -v 'WARNING: Using incubator modules' | tee $log
 
 # Merge Federated test runs.
+# if merged jacoco exist temporarily rename to not overwrite.
 [ -f target/jacoco.exec ] && mv target/jacoco.exec target/jacoco_main.exec
-mvn -ntp -B jacoco:merge
-
-# Merge Federated test runs.
-[ -f target/jacoco.exec ] && mv target/jacoco.exec target/jacoco_main.exec
-mvn -ntp -B jacoco:merge
+# merge jacoco files.
+mvn -ntp -B jacoco:merge 2>&1 | grep -E "BUILD|Total time:|Building SystemDS|jacoco"
 
 grep_args="SUCCESS"
 grepvals="$( tail -n 100 $log | grep $grep_args)"

docker/testsysds.Dockerfile

@@ -79,7 +79,10 @@ RUN Rscript installDependencies.R \
     && rm -f installDependencies.R
 
 # Copy SEAL
-COPY --from=seal-build /seal-install /usr/local
+COPY --from=seal-build /seal-install/lib/ /usr/local/lib/
+COPY --from=seal-build /seal-install/include/ /usr/local/include/
+
+ENV LD_LIBRARY_PATH=/usr/local/lib/
 
 # Finally copy the entrypoint script
 # This is last to enable quick updates to the script after initial local build.

src/main/cpp/build_HE.sh

@@ -20,7 +20,7 @@
 #
 #-------------------------------------------------------------
 
-echo "Build Homomorphic Encryption Liberary: "
+echo "Build Homomorphic Encryption Library: "
 
 # compile HE
 cmake he/ -B HE -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++
@@ -29,4 +29,4 @@ rm -R HE
 
 echo ""
 
-echo "Sucessfull install of Homomorphic Encryption Liberary SEAL"
+echo "Successful install of Homomorphic Encryption Library SEAL"