[nasa#163] Updated docker build scripts to use NUM_CPUS to stop GCC c…

…rashes due to lack of memory;
jplaboratory · Sep 11, 2023 · 4ff2813 · 4ff2813
1 parent f50f77e
commit 4ff2813
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -25,6 +25,6 @@ Vagrant.configure("2") do |config|
         vbox.gui = true
         ### Enable additional configuration as needed
         vbox.cpus = 6
-        vbox.memory = "6144"
+        vbox.memory = "6144" # Should always be > (cpus * 1024)
     end
 end
diff --git a/gsw/scripts/docker_build_fsw.sh b/gsw/scripts/docker_build_fsw.sh
@@ -9,4 +9,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/env.sh
 
 mkdir -p $BASE_DIR/fsw/build
-$DFLAGS --cpus=$NUM_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_fsw" -w $BASE_DIR ivvitc/nos3 make -j build-fsw
+$DFLAGS --cpus=$NUM_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_fsw" -w $BASE_DIR ivvitc/nos3 make -j$NUM_CPUS build-fsw
diff --git a/gsw/scripts/docker_build_sim.sh b/gsw/scripts/docker_build_sim.sh
@@ -9,4 +9,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/env.sh
 
 mkdir -p $BASE_DIR/sim/build
-$DFLAGS --cpus=$NUM_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_sim" -w $BASE_DIR ivvitc/nos3 make -j build-sim
+$DFLAGS --cpus=$NUM_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_sim" -w $BASE_DIR ivvitc/nos3 make -j$NUM_CPUS build-sim