kenaug74/mycobot_ros
1
0
Fork 0
mirror of https://github.com/elephantrobotics/mycobot_ros.git synced 2026-07-14 09:00:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

modify Dockerfile & docker-compose.yml to use ROS melodic

Browse source
This commit is contained in:
Yoshiaki WATANABE 2021-05-18 20:42:31 +09:00
parent 84c4dea360
commit 38a5125306
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -7,7 +7,7 @@ FROM ${BASE_IMAGE}
# (or without GPU) works through docker. # (or without GPU) works through docker.
# I was unable to use the ROS_DISTRO variable here due to this issue: # I was unable to use the ROS_DISTRO variable here due to this issue:
# https://github.com/docker/for-mac/issues/2155 # https://github.com/docker/for-mac/issues/2155
COPY --from=osrf/ros:kinetic-desktop-full / / COPY --from=osrf/ros:melodic-desktop-full / /
# Add ROS env vars to the bashrc # Add ROS env vars to the bashrc
ENV BASH_ENV="/root/launch.sh" ENV BASH_ENV="/root/launch.sh"
@ -26,6 +26,7 @@ RUN apt-get update && \
build-essential \ build-essential \
# Project-specific build dependencies # Project-specific build dependencies
python-pip \ python-pip \
ros-${ROS_DISTRO}-moveit \
ros-${ROS_DISTRO}-serial \ ros-${ROS_DISTRO}-serial \
ros-${ROS_DISTRO}-joint-state-publisher-gui && \ ros-${ROS_DISTRO}-joint-state-publisher-gui && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*

2
docker-compose.yml
View file

@ -12,7 +12,7 @@ x-app: &common
build: build:
context: . context: .
args: &common-args args: &common-args
ROS_DISTRO: "kinetic" ROS_DISTRO: "melodic"
PYMYCOBOT_VERSION: ">=2<3" PYMYCOBOT_VERSION: ">=2<3"
BASE_IMAGE: nvidia/opengl:1.1-glvnd-runtime-ubuntu18.04 BASE_IMAGE: nvidia/opengl:1.1-glvnd-runtime-ubuntu18.04