forked from moveit/moveit
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CI: Modernize environment settings in Dockerfile
- Loading branch information
Showing
2 changed files
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,7 +5,7 @@ ARG ROS_DISTRO=noetic | |
FROM ros:${ROS_DISTRO}-ros-base | ||
LABEL org.opencontainers.image.authors="Robert Haschke <[email protected]>" | ||
|
||
ENV TERM xterm | ||
ENV TERM=xterm | ||
|
||
# Setup (temporary) ROS workspace | ||
WORKDIR /root/ws_moveit | ||
|
@@ -47,4 +47,4 @@ RUN \ | |
git config --global --add safe.directory "*" | ||
|
||
# Continous Integration Setting | ||
ENV IN_DOCKER 1 | ||
ENV IN_DOCKER=1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,12 +7,12 @@ ARG IMAGE=noetic | |
FROM moveit/moveit:${IMAGE}-ci-testing | ||
LABEL org.opencontainers.image.authors="Robert Haschke <[email protected]>" | ||
|
||
ENV PYTHONIOENCODING UTF-8 | ||
ENV PYTHONIOENCODING=UTF-8 | ||
# Export ROS_UNDERLAY for downstream docker containers | ||
ENV ROS_UNDERLAY /root/ws_moveit/install | ||
ENV ROS_UNDERLAY=/root/ws_moveit/install | ||
# Environment variable used in instructions on moveit.ros.org website for running clang-tidy | ||
ENV CATKIN_WS $(realpath $ROS_UNDERLAY/..) | ||
WORKDIR $ROS_UNDERLAY/.. | ||
ENV CATKIN_WS=$ROS_UNDERLAY/.. | ||
WORKDIR $CATKIN_WS | ||
|
||
# Copy MoveIt sources from docker context | ||
COPY . src/moveit | ||
|