Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(docker): add openadkit visualizer container #5742

Open
wants to merge 46 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
1718905
Add simulator and visualizer containers
oguzkaganozt Dec 24, 2024
75b3498
.
oguzkaganozt Dec 24, 2024
dfe0de7
.
oguzkaganozt Dec 24, 2024
9e0d17f
.
oguzkaganozt Jan 2, 2025
47a1df6
style(pre-commit): autofix
pre-commit-ci[bot] Jan 2, 2025
8978e75
create seperate workflow for autoware-tools
oguzkaganozt Jan 16, 2025
9e654fe
style(pre-commit): autofix
pre-commit-ci[bot] Jan 16, 2025
f21ff20
.
oguzkaganozt Jan 30, 2025
034d37d
Add seperate workflow for testing
oguzkaganozt Jan 30, 2025
3532e7c
.
oguzkaganozt Jan 30, 2025
dc4fa90
.
oguzkaganozt Jan 30, 2025
81d52a4
.
oguzkaganozt Jan 30, 2025
889057f
fix typo
oguzkaganozt Jan 30, 2025
326589f
fix spellcheck
oguzkaganozt Jan 30, 2025
ee6ac9a
fix spellcheck
oguzkaganozt Jan 30, 2025
87f465f
.
oguzkaganozt Jan 30, 2025
781a995
.
oguzkaganozt Jan 30, 2025
590776d
fix hadolint errors
oguzkaganozt Jan 30, 2025
9890d6b
fix hadolint errors
oguzkaganozt Jan 30, 2025
2b1a52b
.
oguzkaganozt Jan 30, 2025
7591d99
.
oguzkaganozt Jan 30, 2025
5fa7246
remove ngrok, remove VNC_PASSWORD ARG
oguzkaganozt Jan 31, 2025
ce46b2e
.
oguzkaganozt Jan 31, 2025
476cbba
style(pre-commit): autofix
pre-commit-ci[bot] Jan 31, 2025
555da54
.
oguzkaganozt Feb 3, 2025
c091699
style(pre-commit): autofix
pre-commit-ci[bot] Feb 3, 2025
14146b2
.
oguzkaganozt Feb 3, 2025
2a5f234
.
oguzkaganozt Feb 3, 2025
ad9f40a
fix rviz config
oguzkaganozt Feb 3, 2025
4d23bb7
style(pre-commit): autofix
pre-commit-ci[bot] Feb 3, 2025
215dce5
fix paths
oguzkaganozt Feb 3, 2025
9ba6b30
remove .pcd from dockerignore
oguzkaganozt Feb 4, 2025
4cce5f8
.
oguzkaganozt Feb 4, 2025
9996e7d
.
oguzkaganozt Feb 4, 2025
2b5be69
remove debug workflow
oguzkaganozt Feb 4, 2025
864db56
.
oguzkaganozt Feb 4, 2025
fa38a19
split visualizer
oguzkaganozt Feb 6, 2025
b2ca5c2
get rviz config from universe instead of static file
oguzkaganozt Feb 6, 2025
20b336f
fix rviz config path
oguzkaganozt Feb 6, 2025
2a37780
fix hadolint
oguzkaganozt Feb 6, 2025
74257a5
fix hadolint
oguzkaganozt Feb 6, 2025
7ed6c16
remove redundant mkdir
oguzkaganozt Feb 6, 2025
1240962
apply changes
oguzkaganozt Feb 10, 2025
88e4139
add documentation for visualizer
oguzkaganozt Feb 10, 2025
0026443
style(pre-commit): autofix
pre-commit-ci[bot] Feb 10, 2025
3e07fda
.
oguzkaganozt Feb 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style(pre-commit): autofix
pre-commit-ci[bot] authored and oguzkaganozt committed Feb 9, 2025
commit 47a1df668a6d73ea32fcb46fd6ad9026bb697fa9
2 changes: 1 addition & 1 deletion docker/tools/Dockerfile
Original file line number Diff line number Diff line change
@@ -101,4 +101,4 @@ COPY docker/tools/etc/xstartup /root/.vnc/xstartup
COPY docker/tools/etc/entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh && chmod +x /root/.vnc/xstartup
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/bin/bash"]
CMD ["/bin/bash"]
12 changes: 6 additions & 6 deletions docker/tools/etc/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
configure_vnc() {
# Create Openbox application configuration
mkdir -p /etc/xdg/openbox
cat > /etc/xdg/openbox/rc.xml << 'EOF'
cat >/etc/xdg/openbox/rc.xml <<'EOF'
<?xml version="1.0" encoding="UTF-8"?>
<openbox_config xmlns="http://openbox.org/3.4/rc"
xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -21,7 +21,7 @@ configure_vnc() {
</openbox_config>
EOF
# Create rviz2 start script
cat > /usr/local/bin/start-rviz2.sh << 'EOF'
cat >/usr/local/bin/start-rviz2.sh <<'EOF'
#!/bin/bash
source /opt/ros/humble/setup.bash
source /opt/autoware/setup.bash
@@ -32,8 +32,8 @@ else
fi
EOF
chmod +x /usr/local/bin/start-rviz2.sh
echo "echo 'Autostart executed at $(date)' >> /tmp/autostart.log" >> /etc/xdg/openbox/autostart
echo "/usr/local/bin/start-rviz2.sh" >> /etc/xdg/openbox/autostart
echo "echo 'Autostart executed at $(date)' >> /tmp/autostart.log" >>/etc/xdg/openbox/autostart
echo "/usr/local/bin/start-rviz2.sh" >>/etc/xdg/openbox/autostart

# Start VNC server with Openbox
echo "Starting VNC server with Openbox..."
@@ -47,7 +47,7 @@ EOF

# Set the DISPLAY variable to match VNC server
echo "Setting DISPLAY to :99"
echo "export DISPLAY=:99" >> ~/.bashrc
echo "export DISPLAY=:99" >>~/.bashrc
sleep 2

# Start NoVNC
@@ -79,4 +79,4 @@ EOF
[ "$VNC_ENABLED" == "true" ] && configure_vnc
source "/opt/ros/$ROS_DISTRO/setup.bash"
source "/opt/autoware/setup.bash"
exec "$@"
exec "$@"
2 changes: 1 addition & 1 deletion docker/tools/etc/xstartup
Original file line number Diff line number Diff line change
@@ -12,4 +12,4 @@ echo "Starting Openbox window manager..."
openbox-session &

# Keep the session alive
sleep infinity
sleep infinity