Js docker (#896)

* fixed docker bug minimized the size for docker by removing cache and optimizing which torch is installed * fixed introspection error now docker should be good to go * removed webots as an external module and replaced with a script from bit bots to install. this will make the code a lot more modular and decrease size. Made scripts to install and get the env uptodate so that new members dont have to struggle on installitaion * Removed .idea files --------- Co-authored-by: manx52 <[email protected]>
utra-robosoccer · Sep 27, 2024 · 383fe81 · 383fe81
1 parent 065a2f8
commit 383fe81
Show file tree

Hide file tree

Showing 16 changed files with 178 additions and 226 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@
 # Python compiled files
 __pycache__/
 *.pyc
-.idea/
+.idea
 # webots cache files
 soccer_webots/protos/*.cache
 soccer_webots/protos/Soccerbot_meshes/*.cache

diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "external/webots"]
-	path = external/webots
-	url = [email protected]:utra-robosoccer/webots.git
-	branch = R2022b
 [submodule "external/GameController"]
 	path = external/GameController
 	url = [email protected]:RoboCup-Humanoid-TC/GameController.git

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/remote-mappings.xml b/.idea/remote-mappings.xml
diff --git a/.idea/soccerbot.iml b/.idea/soccerbot.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/external/webots b/external/webots
diff --git a/soccerbot/launch/modules/webots.launch b/soccerbot/launch/modules/webots.launch
@@ -1,7 +1,7 @@
 <launch>
     <arg name="single" default="true" />
     <env name="GAME_CONTROLLER_HOME" value="$(env HOME)/catkin_ws/src/soccerbot/external/GameController" />
-    <env name="WEBOTS_HOME" value="$(env HOME)/catkin_ws/src/soccerbot/external/webots" />
+    <env name="WEBOTS_HOME" value="/usr/local/webots" />
     <env name="WEBOTS_ROBOCUP_GAME" value="$(env HOME)/catkin_ws/src/soccerbot/external/hlvs_webots/controllers/referee/game.json" />
     <env name="TEAM_1_PLAYERS_ON_FIELD" value="1" if="$(arg single)" />
     <env name="TEAM_2_PLAYERS_ON_FIELD" value="" if="$(arg single)" />

diff --git a/soccerbot/scripts/webots.sh b/soccerbot/scripts/webots.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 export GAME_CONTROLLER_HOME=~/catkin_ws/src/soccerbot/external/GameController/
 export JAVA_HOME=/usr
-cd ~/catkin_ws/src/soccerbot/external/webots || exit 1
-#./webots ./../hlvs_webots/worlds/robocup.wbt
-./webots ./../hlvs_webots/worlds/robocup.wbt
+export WEBOTS_HOME=/usr/local/webots
+
+cd ~/catkin_ws/src/soccerbot/external || exit 1
+webots ./hlvs_webots/worlds/robocup.wbt