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.

Sign up for GitHub

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: Enable Gazebo on arm64 Jazzy/Rolling #194

Merged
merged 1 commit into from
Dec 29, 2024
Merged

feat: Enable Gazebo on arm64 Jazzy/Rolling #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 5 additions & 10 deletions jazzy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,11 @@ RUN apt-get update -q && \

RUN rosdep update

# Install simulation packages are
# not ready for amd64/arm64 for now (May 27th, 2024)
# https://repo.ros2.org/status_page/jazzy_default.html?q=RED
# RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
# apt-get update -q && \
# apt-get install -y \
# ros-${ROS_DISTRO}-gazebo-ros-pkgs \
# ros-${ROS_DISTRO}-ros-gz && \
# rm -rf /var/lib/apt/lists/*; \
# fi
# Install simulation packages
RUN apt-get update -q && \
apt-get install -y \
ros-${ROS_DISTRO}-ros-gz && \
rm -rf /var/lib/apt/lists/*

# Enable apt-get completion after running `apt-get update` in the container
RUN rm /etc/apt/apt.conf.d/docker-clean
Expand Down
14 changes: 9 additions & 5 deletions jazzy/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,13 +349,17 @@ Icon=vscodium
EOF
chown -R "$USER:$USER" "$HOME/Desktop"

# clearup
PASSWORD=
VNC_PASSWORD=

echo "============================================================================================"
echo "NOTE 1: --security-opt seccomp=unconfined flag is required to launch Ubuntu Jammy based image."
echo "Launched docker container."
echo -e 'Open \e]8;;http://127.0.0.1:6080\e\\http://127.0.0.1:6080\e]8;;\e\\ via web browser.'
echo ""
echo "NOTE 1: Default user is \"$USER\", password is \"$PASSWORD\"."
echo "NOTE 2: --security-opt seccomp=unconfined flag is required to launch Ubuntu Jammy/Noble based image on some environment."
echo -e 'See \e]8;;https://github.com/Tiryoh/docker-ros2-desktop-vnc/pull/56\e\\https://github.com/Tiryoh/docker-ros2-desktop-vnc/pull/56\e]8;;\e\\'
echo "============================================================================================"

# clearup
PASSWORD=
VNC_PASSWORD=

exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf
15 changes: 5 additions & 10 deletions rolling/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,16 +114,11 @@ RUN apt-get update -q && \

RUN rosdep update

# Install simulation packages are
# not ready for amd64/arm64 for now (May 24th, 2023)
# https://repo.ros2.org/status_page/rolling_default.html?q=RED
# RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
# apt-get update -q && \
# apt-get install -y \
# ros-${ROS_DISTRO}-gazebo-ros-pkgs \
# ros-${ROS_DISTRO}-ros-gz && \
# rm -rf /var/lib/apt/lists/*; \
# fi
# Install simulation packages
RUN apt-get update -q && \
apt-get install -y \
ros-${ROS_DISTRO}-ros-gz && \
rm -rf /var/lib/apt/lists/*

# Enable apt-get completion after running `apt-get update` in the container
RUN rm /etc/apt/apt.conf.d/docker-clean
Expand Down
16 changes: 9 additions & 7 deletions rolling/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,15 +338,17 @@ Icon=vscodium
EOF
chown -R "$USER:$USER" "$HOME/Desktop"

# clearup
PASSWORD=
VNC_PASSWORD=

echo "============================================================================================"
echo "NOTE 1: --security-opt seccomp=unconfined flag is required to launch Ubuntu Jammy based image."
echo "Launched docker container."
echo -e 'Open \e]8;;http://127.0.0.1:6080\e\\http://127.0.0.1:6080\e]8;;\e\\ via web browser.'
echo ""
echo "NOTE 1: Default user is \"$USER\", password is \"$PASSWORD\"."
echo "NOTE 2: --security-opt seccomp=unconfined flag is required to launch Ubuntu Jammy/Noble based image on some environment."
Comment on lines +342 to +346
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Security: Avoid displaying credentials in container logs

The password is currently being displayed in plain text in the container logs. This could expose sensitive information if the logs are captured or persisted.

Consider masking the password in the output message:

-echo "NOTE 1: Default user is \"$USER\", password is \"$PASSWORD\"."
+echo "NOTE 1: Default user is \"$USER\", password is [REDACTED]"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
echo "Launched docker container."
echo -e 'Open \e]8;;http://127.0.0.1:6080\e\\http://127.0.0.1:6080\e]8;;\e\\ via web browser.'
echo ""
echo "NOTE 1: Default user is \"$USER\", password is \"$PASSWORD\"."
echo "NOTE 2: --security-opt seccomp=unconfined flag is required to launch Ubuntu Jammy/Noble based image on some environment."
echo "Launched docker container."
echo -e 'Open \e]8;;http://127.0.0.1:6080\e\\http://127.0.0.1:6080\e]8;;\e\\ via web browser.'
echo ""
echo "NOTE 1: Default user is \"$USER\", password is [REDACTED]"
echo "NOTE 2: --security-opt seccomp=unconfined flag is required to launch Ubuntu Jammy/Noble based image on some environment."

echo -e 'See \e]8;;https://github.com/Tiryoh/docker-ros2-desktop-vnc/pull/56\e\\https://github.com/Tiryoh/docker-ros2-desktop-vnc/pull/56\e]8;;\e\\'
echo "NOTE 2: Before stopping to commit docker container to new docker image, log out first."
echo -e 'See \e]8;;https://github.com/Tiryoh/docker-ros2-desktop-vnc/issue/131\e\\https://github.com/Tiryoh/docker-ros2-desktop-vnc/issue/131\e]8;;\e\\'
echo "============================================================================================"

# clearup
PASSWORD=
VNC_PASSWORD=

exec /bin/tini -- supervisord -n -c /etc/supervisor/supervisord.conf
Loading