diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 28419fdf..25b42f98 100644 --- a/.github/workflows/build.yml +++ b/.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: diff --git a/scripts/env.sh b/scripts/env.sh index 426d55f9..3030e8d1 100755 --- a/scripts/env.sh +++ b/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 diff --git a/scripts/prepare.sh b/scripts/prepare.sh index 03371dc6..7c75b276 100755 --- a/scripts/prepare.sh +++ b/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 ""