update vars

This commit is contained in:
Björn Ellensohn 2023-08-02 18:38:36 +02:00
parent 3618409713
commit 87d6d21a50

View File

@ -1,6 +1,6 @@
ARG ROS_DISTRO=humble ARG ROS_DISTRO=humble
ARG UNDERLAY_WS=/bot_mini_ws ARG UNDERLAY_WS=/bot_mini_ws
ARG OVERLAY_WS=/bot_mini_ws ARG OVERLAY_WS=/overlay_ws
# This file should work for both amd64 and arm64 builds. # This file should work for both amd64 and arm64 builds.
@ -8,11 +8,13 @@ ARG OVERLAY_WS=/bot_mini_ws
# Base Image for Bot Mini Control # # Base Image for Bot Mini Control #
######################################## ########################################
FROM ros:${ROS_DISTRO} as base FROM ros:${ROS_DISTRO} as base
ENV ROS_DISTRO=${ROS_DISTRO}
ENV UNDERLAY_WS=${UNDERLAY_WS}
SHELL ["/bin/bash", "-c"] SHELL ["/bin/bash", "-c"]
ENV ROS_DISTRO=${ROS_DISTRO}
ENV UNDERLAY_WS=${UNDERLAY_WS}
ENV OVERLAY_WS=${OVERLAY_WS}
# Create Colcon workspace with external dependencies # Create Colcon workspace with external dependencies
RUN mkdir -p /${UNDERLAY_WS}/src RUN mkdir -p /${UNDERLAY_WS}/src
WORKDIR /${UNDERLAY_WS}/src WORKDIR /${UNDERLAY_WS}/src
@ -42,8 +44,6 @@ ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
########################################### ###########################################
FROM base AS overlay FROM base AS overlay
ENV OVERLAY_WS=${OVERLAY_WS}
# Create an overlay Colcon workspace # Create an overlay Colcon workspace
RUN mkdir -p /${OVERLAY_WS}/src RUN mkdir -p /${OVERLAY_WS}/src
WORKDIR /${OVERLAY_WS}/src WORKDIR /${OVERLAY_WS}/src