Skip to content

Commit

Permalink
CI: Modernize environment settings in Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaschke committed Sep 10, 2024
1 parent dee554d commit 2e5b70c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .docker/ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -47,4 +47,4 @@ RUN \
git config --global --add safe.directory "*"

# Continous Integration Setting
ENV IN_DOCKER 1
ENV IN_DOCKER=1
8 changes: 4 additions & 4 deletions .docker/source/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2e5b70c

Please sign in to comment.