Skip to content

Commit

Permalink
Feature: add RTT autoref
Browse files Browse the repository at this point in the history
  • Loading branch information
tollsimy committed Nov 7, 2023
1 parent 00423dc commit aba5062
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
[submodule "external/autoref"]
path = external/autoref
url = https://github.com/robotics-erlangen/autoref.git
[submodule "roboteam_autoref"]
path = roboteam_autoref
url = [email protected]:RoboTeamTwente/roboteam_autoref.git
branch = main
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ This repository contains the following projects:

\* `RoboTeam World` its executable is named `roboteam_observer`, since `RoboTeam AI` also contains a class named `World`, which caused confusion.



## How to
Refer to `docker/README.md` for usage of our software.

Expand Down
5 changes: 5 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,15 @@ then
OK=1
fi

# Check if the script is being executed from inside container or explicitly
# asked to run it on host environment
if [ -f /.dockerenv ] || [ "$OK" = "1" ];
then
if [ "$0" == "./build.sh" ];
then
echo "Checking submodules"
git submodule update --init --recursive
echo "Done"
#rm -rf build
mkdir -p build
pushd build
Expand Down
16 changes: 16 additions & 0 deletions docker/game/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,22 @@ services:
volumes:
- ../../roboteam_interface/:/home/roboteamtwente/

roboteam_autoref:
image: gradle:8.4.0-jdk17
container_name: RTT_roboteam_autoref
user: gradle # Do not build as root
restart: always
working_dir: "/home/roboteamtwente/"
command: sh -c "./gradlew run --args=\"-cli -active --world-ip=127.0.0.1 --world-port=5558 --gc-ip=127.0.0.1 --gc-port=10007\""
network_mode: "host" # Workaround to connect from interface on host to AI websocket, please fix
expose:
- 10007:10007 # GC port
- 5558:5558 # World port
environment:
- GRADLE_USER_HOME=/home/roboteamtwente/.cache # Cache gradle dependencies
volumes:
- ../../roboteam_autoref/:/home/roboteamtwente/

erforce_autoref:
image: rtt-build-env:latest
container_name: RTT_erforce_autoref
Expand Down
18 changes: 17 additions & 1 deletion docker/simulator/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,22 @@ services:
volumes:
- ../../roboteam_interface/:/home/roboteamtwente/

roboteam_autoref:
image: gradle:8.4.0-jdk17
container_name: RTT_roboteam_autoref
user: gradle # Do not build as root
restart: always
working_dir: "/home/roboteamtwente/"
command: sh -c "./gradlew run --args=\"-cli -active --world-ip=127.0.0.1 --world-port=5558 --gc-ip=127.0.0.1 --gc-port=10007\""
network_mode: "host" # Workaround to connect from interface on host to AI websocket, please fix
expose:
- 10007:10007 # GC port
- 5558:5558 # World port
environment:
- GRADLE_USER_HOME=/home/roboteamtwente/.cache # Cache gradle dependencies
volumes:
- ../../roboteam_autoref/:/home/roboteamtwente/

erforce_autoref:
image: rtt-build-env:latest
container_name: RTT_erforce_autoref
Expand All @@ -96,7 +112,7 @@ services:
network_mode: "host" # Workaround to connect from interface on host to AI websocket, please fix
expose:
- 10020:10020 # Vision port simulator
- 10003:10003 # Ref port
- 10003:10003 # GC port
- 10010:10010 # Tracker port
volumes:
- ../../:/home/roboteamtwente/
Expand Down
1 change: 1 addition & 0 deletions roboteam_autoref
Submodule roboteam_autoref added at 3b3363

0 comments on commit aba5062

Please sign in to comment.