Skip to content

Commit

Permalink
"ENV key=value" should be used (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Aug 14, 2024
1 parent eab6e52 commit dbc57d5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Dockerfile.debian11
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ RUN curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8
ARG ROS_DISTRO
# Environment variables defined using the ENV instruction always override an ARG instruction of the same name.
ENV ROS_DISTRO=${ROS_DISTRO:-rolling}
Expand Down Expand Up @@ -104,7 +104,7 @@ RUN colcon mixin add default \
colcon metadata update

# install dependencies via apt
ENV DEBCONF_NOWARNINGS yes
ENV DEBCONF_NOWARNINGS=yes

# install and activate ccache, lld, cppcheck
RUN \
Expand All @@ -126,7 +126,7 @@ RUN \

# ---- ROS ----
# clone source, ROS core
ENV ROS2_WS /opt/ros2_ws
ENV ROS2_WS=/opt/ros2_ws
RUN mkdir -p $ROS2_WS/src
WORKDIR $ROS2_WS
ADD ros-controls.$ROS_DISTRO.repos .
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.debian12
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ RUN curl -sSL https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -o
curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -

# setup environment
ENV LANG C.UTF-8
ENV LC_ALL C.UTF-8
ENV LANG=C.UTF-8
ENV LC_ALL=C.UTF-8
ARG ROS_DISTRO
# Environment variables defined using the ENV instruction always override an ARG instruction of the same name.
ENV ROS_DISTRO=${ROS_DISTRO:-iron}
Expand Down Expand Up @@ -105,7 +105,7 @@ RUN colcon mixin add default \
colcon metadata update

# install dependencies via apt
ENV DEBCONF_NOWARNINGS yes
ENV DEBCONF_NOWARNINGS=yes

# install and activate ccache, lld, cppcheck
RUN \
Expand All @@ -119,7 +119,7 @@ RUN \

# ---- ROS ----
# clone source, ROS core
ENV ROS2_WS /opt/ros2_ws
ENV ROS2_WS=/opt/ros2_ws
RUN mkdir -p $ROS2_WS/src
WORKDIR $ROS2_WS
ADD ros-controls.$ROS_DISTRO.repos .
Expand Down

0 comments on commit dbc57d5

Please sign in to comment.