Merge pull request #320 from #231

[#231]  AMD64 and ARM64 container support

.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     fsw:
       runs-on: ubuntu-latest
       container:
-        image: ivvitc/nos3-64:dev
+        image: ivvitc/nos3-64:20240618
       steps:
         - uses: actions/checkout@v4
           with:
@@ -29,7 +29,7 @@ jobs:
     sim:
       runs-on: ubuntu-latest
       container:
-        image: ivvitc/nos3-64:dev
+        image: ivvitc/nos3-64:20240618
       steps:
         - uses: actions/checkout@v2
           with:

scripts/env.sh

@@ -40,7 +40,7 @@ OPENC3_PATH=$OPENC3_DIR/openc3.sh
     DNETWORK="docker network"
 #fi
 
-DBOX="ivvitc/nos3-64:20240430"
+DBOX="ivvitc/nos3-64:20240618"
 
 # Debugging
 #echo "Script directory = " $SCRIPT_DIR

scripts/prepare.sh

@@ -39,9 +39,26 @@ $DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -w $USER_NO
 echo ""
 echo ""
 
-echo "Prepare Igniter..."
+echo "NOS3 required preparations complete!"
+echo "Proceeding to optional additions."
+echo ""
+echo ""
+
+echo "Prepare Igniter (optional)..."
 pip3 install pyside6 xmltodict
 cd $BASE_DIR
 python3 $BASE_DIR/cfg/gui/cfg_gui_main.py &
 echo ""
 echo ""
+
+sleep 3
+echo ""
+echo ""
+
+echo "NOS3 prep script complete:"
+echo "  Some above optional installations may have failed, that's ok. You just may not have those extra features."
+echo "  You can choose to use the Igniter GUI or close it in favor of the command line."
+echo "  To launch igniter again simply run the following in the terminal:"
+echo "    make igniter"
+echo ""
+echo ""