Skip to content

Commit d2e3289

Browse files
committed
devcontainer working, compressed image working
1 parent 188eb92 commit d2e3289

File tree

3 files changed

+31
-3
lines changed

3 files changed

+31
-3
lines changed

.devcontainer/Dockerfile

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
FROM ubuntu:noble
2+
ENV DEBIAN_FRONTEND=noninteractive
3+
RUN apt update && apt install -y locales && locale-gen en_US en_US.UTF-8 && update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
4+
ENV LANG=en_US.UTF-8
5+
RUN apt install -y software-properties-common && add-apt-repository universe
6+
RUN apt update && apt install -y curl && curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o /usr/share/keyrings/ros-archive-keyring.gpg
7+
RUN echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/ros-archive-keyring.gpg] http://packages.ros.org/ros2/ubuntu $(. /etc/os-release && echo $UBUNTU_CODENAME) main" > /etc/apt/sources.list.d/ros2.list
8+
RUN apt update && apt install -y \
9+
python3-flake8-blind-except \
10+
python3-flake8-class-newline \
11+
python3-flake8-deprecated \
12+
python3-mypy \
13+
python3-pip \
14+
python3-pytest \
15+
python3-pytest-cov \
16+
python3-pytest-mock \
17+
python3-pytest-repeat \
18+
python3-pytest-rerunfailures \
19+
python3-pytest-runner \
20+
python3-pytest-timeout \
21+
ros-dev-tools
22+
WORKDIR /ros2_rolling
23+
RUN mkdir src && vcs import --input https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos src
24+
RUN apt upgrade -y && rosdep init && rosdep update && rosdep install --from-paths src --ignore-src -y --skip-keys "fastcdr rti-connext-dds-6.0.1 urdfdom_headers"

.devcontainer/devcontainer.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
33
{
44
"name": "rviz_rolling",
5-
"image": "ros:rolling-ros-base"
5+
"build": {
6+
// Sets the run context to one level up instead of the .devcontainer folder.
7+
// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
8+
"dockerfile": "Dockerfile"
9+
},
610

711
// Features to add to the dev container. More info: https://containers.dev/features.
812
// "features": {},
@@ -19,7 +23,7 @@
1923

2024
// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
2125
// "remoteUser": "devcontainer"
22-
"workspaceMount": "source=${~/ros2_rolling},target=/ros2_rolling,type=bind",
26+
"workspaceMount": "source=${localWorkspaceFolder},target=/ros2_rolling/src/ros2/rviz,type=bind",
2327
"workspaceFolder": "/ros2_rolling/src/ros2/rviz",
2428
//"overrideCommand": false
2529
"runArgs": [

rviz_default_plugins/src/rviz_default_plugins/displays/image/image_display.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ void ImageDisplay::onDisable()
147147

148148
// Need a signature with pass by reference for image_transport_.subscribe
149149
void ImageDisplay::incomingMessage(const sensor_msgs::msg::Image::ConstSharedPtr & img_msg){
150-
ImageDisplay::incomingMessage(img_msg);
150+
ImageTransportDisplay<sensor_msgs::msg::Image>::incomingMessage(img_msg);
151151
}
152152

153153
void ImageDisplay::subscribe(){

0 commit comments

Comments
 (0)