Skip to content

Commit a5abfc5

Browse files
committed
Porting the new changes available in old_manager
1 parent fbddc36 commit a5abfc5

15 files changed

+527
-112
lines changed

README.md

+12-5
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,34 @@
22

33
# RoboticsAcademy: Learn Robotics, Artificial Intelligence and Computer Vision
44

5-
JdeRobot Academy is an **open source** platform that has a collection of exercises to learn robotics in a practical way. Gazebo simulator is the main tool required for testing with ROS. Its latest documentation (including installation recipes, current available exercises and illustrative videos) is on its <a href="https://jderobot.github.io/RoboticsAcademy">webpage</a>.
5+
JdeRobot Academy is an **open source** platform that provides a collection of exercises for learning robotics in a practical way. Its latest documentation (including installation recipes, current available exercises and illustrative videos) is on its <a href="https://jderobot.github.io/RoboticsAcademy">webpage</a>. RoboticsAcademy is completely ROS-based, and includes robotics standard tools like Gazebo and Rviz.
66

7-
If you are a contributor, please note that we use GitHub Pages and a Jekyll theme (MinimalMistakes) for Academy web page. Feel free to install Jekyll locally, so that, you can test your changes before submitting your pull-request.
7+
If you are a contributor, please note that we use GitHub Pages and a Jekyll theme (MinimalMistakes) for the Academy web page. Feel free to install Jekyll locally, so that, you can test your changes before submitting your pull-request.
88

9-
## How to contribute?
9+
# Running RoboticsAcademy
1010

11-
Take a look at the [contributing](CONTRIBUTING.md) guide lines.
11+
```
12+
curl -s https://raw.githubusercontent.com/JdeRobot/RoboticsAcademy/humble_devel/scripts/run_academy.sh | sudo bash
13+
```
14+
15+
# How to contribute?
1216

17+
Take a look at the [contributing](CONTRIBUTING.md) guide lines.
1318

19+
## Development resources
1420

15-
## INDEX
1621
- [Instructions for developers.][]
1722
- [Client side.][] (Robotics Academy architecture)
1823
- [Repository Architecture.][]
1924
- [Generate a mini RADI.][]
2025
- [Humble mini RADI structure.][]
2126
- [Develop using volume binding.][]
27+
- [ROS2 and superthin templates migration.][]
2228

2329
[Instructions for developers.]: ./docs/InstructionsForDevelopers.md
2430
[Client side.]: ./docs/clientside.md
2531
[Repository Architecture.]: ./docs/RepositoryArchitecture.md
2632
[Generate a mini RADI.]: ./docs/generate_a_mini_radi.md
2733
[Humble mini RADI structure.]: ./scripts/mini_RADI/README.md
2834
[Develop using volume binding.]: ./docs/develop_binding_volumes.md
35+
[ROS2 and superthin templates migration.]: ./docs/exercise-status.md

docker-compose.yml compose_cfg/dev_humble_cpu.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ version: '3.8'
22

33
services:
44
robotics-academy:
5-
image: jderobot/robotics-academy:hal_test
6-
container_name: hal_test
5+
image: jderobot/robotics-academy:4.5.9
6+
container_name: developer-container
77
# deploy:
88
# resources:
99
# reservations:

compose_cfg/dev_humble_gpu.yaml

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
version: '3.8'
2+
3+
services:
4+
robotics-academy:
5+
image: jderobot/robotics-academy:4.5.9
6+
container_name: developer-container
7+
# deploy:
8+
# resources:
9+
# reservations:
10+
# devices:
11+
# - driver: nvidia
12+
# count: all
13+
# capabilities: [gpu]
14+
devices:
15+
- /dev/dri/card0:/dev/dri/card0
16+
- /dev/dri/renderD128:/dev/dri/renderD128
17+
ports:
18+
- "7164:7164"
19+
- "2303:2303"
20+
- "1905:1905"
21+
- "8765:8765"
22+
- "6080:6080"
23+
- "1108:1108"
24+
- "7163:7163"
25+
volumes:
26+
- type: bind
27+
source: ./
28+
target: /RoboticsAcademy
29+
tty: true
30+
stdin_open: true

docker-compose-user.yml compose_cfg/user_humble_cpu.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ version: '3.8'
22

33
services:
44
robotics-academy:
5-
image: jderobot/robotics-academy:4.5.3.beta
6-
container_name: radi-4.5.5.beta
7-
deploy:
8-
resources:
9-
reservations:
10-
devices:
11-
- driver: nvidia
12-
count: all
13-
capabilities: [gpu]
5+
image: jderobot/robotics-academy:4.5.9
6+
container_name: user_container
7+
# deploy:
8+
# resources:
9+
# reservations:
10+
# devices:
11+
# - driver: nvidia
12+
# count: all
13+
# capabilities: [gpu]
1414
# devices:
1515
# - /dev/dri/card0:/dev/dri/card0
1616
# - /dev/dri/renderD128:/dev/dri/renderD128

compose_cfg/user_humble_gpu.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: '3.8'
2+
3+
services:
4+
robotics-academy:
5+
image: jderobot/robotics-academy:4.5.9
6+
container_name: user_container
7+
# deploy:
8+
# resources:
9+
# reservations:
10+
# devices:
11+
# - driver: nvidia
12+
# count: all
13+
# capabilities: [gpu]
14+
devices:
15+
- /dev/dri/card0:/dev/dri/card0
16+
- /dev/dri/renderD128:/dev/dri/renderD128
17+
ports:
18+
- "7164:7164"
19+
- "2303:2303"
20+
- "1905:1905"
21+
- "8765:8765"
22+
- "6080:6080"
23+
- "1108:1108"
24+
- "7163:7163"
25+
tty: true
26+
stdin_open: true

0 commit comments

Comments
 (0)