Updated container builds

build_containers.sh

@@ -6,7 +6,8 @@ docker build -f Dockerfile -t pqtest:def .
 # Build the ref liboqs
 docker build -f Dockerfile.ref -t pqtest:ref .
 # Build the no-opt liboqs
-docker build -f Dockerfile.noavx -t pqtest:noopt .
+docker build -f Dockerfile.noavx -t pqtest:noavx .
 # build the ref version with aes-ni disabled
 docker build -f Dockerfile.noaesni -t pqtest:noaesni .
-
+# Disable sha extension
+docker build -f Dockerfile.nosha -t pqtest:nosha .

run_containers.sh

 #!/bin/bash
 set -ex
 
-folder="data"
+folder="data_time_5"
 
 # Run the tests
 # The container needs to run with privileges to mount the virtual network
@@ -13,17 +13,9 @@ docker run -v "$(pwd)/${folder}/def:/opt/experiment/code/data" --privileged pqte
 
 docker run -v "$(pwd)/${folder}/ref:/opt/experiment/code/data" --privileged pqtest:ref bash -c "./run_v2.sh"
 
-docker run -v "$(pwd)/${folder}/noopt:/opt/experiment/code/data" --privileged pqtest:noopt bash -c "./run_v2.sh"
+docker run -v "$(pwd)/${folder}/noavx:/opt/experiment/code/data" --privileged pqtest:noavx bash -c "./run_v2.sh"
 
-docker run -v "$(pwd)/${folder}/aesni:/opt/experiment/code/data" --privileged pqtest:noaesni bash -c "./run_v2.sh"
+docker run -v "$(pwd)/${folder}/noaesni:/opt/experiment/code/data" --privileged pqtest:noaesni bash -c "./run_v2.sh"
 
-# Measure 
-
-#docker run -v "$(pwd)/${folder}/def:/opt/experiment/code/data" --privileged pqtest:def bash -c "./run.sh"
-
-#docker run -v "$(pwd)/${folder}/ref:/opt/experiment/code/data" --privileged pqtest:ref bash -c "./run.sh"
-
-#docker run -v "$(pwd)/${folder}/noopt:/opt/experiment/code/data" --privileged pqtest:noopt bash -c "./run.sh"
-
-#docker run -v "$(pwd)/${folder}/aesni:/opt/experiment/code/data" --privileged pqtest:noaesni bash -c "./run.sh"
+docker run -v "$(pwd)/${folder}/nosha:/opt/experiment/code/data" --privileged pqtest:nosha bash -c "./run_v2.sh"