Skip to content

Commit 91bf420

Browse files
committed
simplify mount=type=bind options
Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
1 parent c487b98 commit 91bf420

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

docker/Dockerfile

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,12 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
166166
&& /autoware/cleanup_apt.sh
167167

168168
RUN --mount=type=cache,target=${CCACHE_DIR} \
169-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/core/autoware_adapi_msgs,target=/autoware/src/core/autoware_adapi_msgs \
170-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/core/autoware_cmake,target=/autoware/src/core/autoware_cmake \
171-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/core/autoware_internal_msgs,target=/autoware/src/core/autoware_internal_msgs \
172-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/core/autoware_lanelet2_extension,target=/autoware/src/core/autoware_lanelet2_extension \
173-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/core/autoware_msgs,target=/autoware/src/core/autoware_msgs \
174-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/core/autoware_utils,target=/autoware/src/core/autoware_utils \
169+
--mount=type=bind,source=src/core/autoware_adapi_msgs,target=/autoware/src/core/autoware_adapi_msgs \
170+
--mount=type=bind,source=src/core/autoware_cmake,target=/autoware/src/core/autoware_cmake \
171+
--mount=type=bind,source=src/core/autoware_internal_msgs,target=/autoware/src/core/autoware_internal_msgs \
172+
--mount=type=bind,source=src/core/autoware_lanelet2_extension,target=/autoware/src/core/autoware_lanelet2_extension \
173+
--mount=type=bind,source=src/core/autoware_msgs,target=/autoware/src/core/autoware_msgs \
174+
--mount=type=bind,source=src/core/autoware_utils,target=/autoware/src/core/autoware_utils \
175175
source /opt/ros/"$ROS_DISTRO"/setup.bash \
176176
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
177177

@@ -192,7 +192,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
192192
&& /autoware/cleanup_apt.sh
193193

194194
RUN --mount=type=cache,target=${CCACHE_DIR} \
195-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/core/autoware.core,target=/autoware/src/core/autoware.core \
195+
--mount=type=bind,source=src/core/autoware.core,target=/autoware/src/core/autoware.core \
196196
source /opt/ros/"$ROS_DISTRO"/setup.bash \
197197
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
198198

@@ -215,8 +215,8 @@ RUN --mount=type=ssh \
215215

216216
# hadolint ignore=SC1091
217217
RUN --mount=type=cache,target=${CCACHE_DIR} \
218-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/universe/autoware.universe/common,target=/autoware/src/universe/autoware.universe/common \
219-
--mount=type=bind,from=rosdep-depend,source=/autoware/src/universe/external,target=/autoware/src/universe/external \
218+
--mount=type=bind,source=src/universe/autoware.universe/common,target=/autoware/src/universe/autoware.universe/common \
219+
--mount=type=bind,source=src/universe/external,target=/autoware/src/universe/external \
220220
source /opt/ros/"$ROS_DISTRO"/setup.bash \
221221
&& source /opt/autoware/setup.bash \
222222
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
@@ -253,8 +253,8 @@ RUN --mount=type=ssh \
253253

254254
# hadolint ignore=SC1091
255255
RUN --mount=type=cache,target=${CCACHE_DIR} \
256-
--mount=type=bind,from=rosdep-universe-sensing-perception-depend,source=/autoware/src/universe/autoware.universe/perception,target=/autoware/src/universe/autoware.universe/perception \
257-
--mount=type=bind,from=rosdep-universe-sensing-perception-depend,source=/autoware/src/universe/autoware.universe/sensing,target=/autoware/src/universe/autoware.universe/sensing \
256+
--mount=type=bind,source=src/universe/autoware.universe/perception,target=/autoware/src/universe/autoware.universe/perception \
257+
--mount=type=bind,source=src/universe/autoware.universe/sensing,target=/autoware/src/universe/autoware.universe/sensing \
258258
source /opt/ros/"$ROS_DISTRO"/setup.bash \
259259
&& source /opt/autoware/setup.bash \
260260
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
@@ -280,8 +280,8 @@ COPY --from=universe-sensing-perception-devel /opt/autoware /opt/autoware
280280

281281
# hadolint ignore=SC1091
282282
RUN --mount=type=cache,target=${CCACHE_DIR} \
283-
--mount=type=bind,from=rosdep-universe-sensing-perception-depend,source=/autoware/src/universe/autoware.universe/perception,target=/autoware/src/universe/autoware.universe/perception \
284-
--mount=type=bind,from=rosdep-universe-sensing-perception-depend,source=/autoware/src/universe/autoware.universe/sensing,target=/autoware/src/universe/autoware.universe/sensing \
283+
--mount=type=bind,source=src/universe/autoware.universe/perception,target=/autoware/src/universe/autoware.universe/perception \
284+
--mount=type=bind,source=src/universe/autoware.universe/sensing,target=/autoware/src/universe/autoware.universe/sensing \
285285
source /opt/ros/"$ROS_DISTRO"/setup.bash \
286286
&& source /opt/autoware/setup.bash \
287287
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware "--packages-above-and-dependencies autoware_tensorrt_common"
@@ -305,8 +305,8 @@ RUN --mount=type=ssh \
305305

306306
# hadolint ignore=SC1091
307307
RUN --mount=type=cache,target=${CCACHE_DIR} \
308-
--mount=type=bind,from=rosdep-universe-localization-mapping-depend,source=/autoware/src/universe/autoware.universe/localization,target=/autoware/src/universe/autoware.universe/localization \
309-
--mount=type=bind,from=rosdep-universe-localization-mapping-depend,source=/autoware/src/universe/autoware.universe/map,target=/autoware/src/universe/autoware.universe/map \
308+
--mount=type=bind,source=src/universe/autoware.universe/localization,target=/autoware/src/universe/autoware.universe/localization \
309+
--mount=type=bind,source=src/universe/autoware.universe/map,target=/autoware/src/universe/autoware.universe/map \
310310
source /opt/ros/"$ROS_DISTRO"/setup.bash \
311311
&& source /opt/autoware/setup.bash \
312312
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
@@ -327,13 +327,13 @@ RUN --mount=type=ssh \
327327

328328
# hadolint ignore=SC1091
329329
RUN --mount=type=cache,target=${CCACHE_DIR} \
330-
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/control,target=/autoware/src/universe/autoware.universe/control \
331-
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/planning,target=/autoware/src/universe/autoware.universe/planning \
330+
--mount=type=bind,source=src/universe/autoware.universe/control,target=/autoware/src/universe/autoware.universe/control \
331+
--mount=type=bind,source=src/universe/autoware.universe/planning,target=/autoware/src/universe/autoware.universe/planning \
332332
# TODO(youtalk): Remove --mount options when https://github.com/autowarefoundation/autoware.universe/issues/8805 is resolved
333-
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/map/autoware_map_loader,target=/autoware/src/universe/autoware.universe/map/autoware_map_loader \
334-
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/map/autoware_map_projection_loader,target=/autoware/src/universe/autoware.universe/map/autoware_map_projection_loader \
335-
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/sensing/autoware_pcl_extensions,target=/autoware/src/universe/autoware.universe/sensing/autoware_pcl_extensions \
336-
--mount=type=bind,from=rosdep-universe-planning-control-depend,source=/autoware/src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor,target=/autoware/src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor \
333+
--mount=type=bind,source=src/universe/autoware.universe/map/autoware_map_loader,target=/autoware/src/universe/autoware.universe/map/autoware_map_loader \
334+
--mount=type=bind,source=src/universe/autoware.universe/map/autoware_map_projection_loader,target=/autoware/src/universe/autoware.universe/map/autoware_map_projection_loader \
335+
--mount=type=bind,source=src/universe/autoware.universe/sensing/autoware_pcl_extensions,target=/autoware/src/universe/autoware.universe/sensing/autoware_pcl_extensions \
336+
--mount=type=bind,source=src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor,target=/autoware/src/universe/autoware.universe/sensing/autoware_pointcloud_preprocessor \
337337
source /opt/ros/"$ROS_DISTRO"/setup.bash \
338338
&& source /opt/autoware/setup.bash \
339339
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
@@ -357,10 +357,10 @@ RUN --mount=type=ssh \
357357

358358
# hadolint ignore=SC1091
359359
RUN --mount=type=cache,target=${CCACHE_DIR} \
360-
--mount=type=bind,from=rosdep-universe-vehicle-system-depend,source=/autoware/src/universe/autoware.universe/vehicle,target=/autoware/src/universe/autoware.universe/vehicle \
361-
--mount=type=bind,from=rosdep-universe-vehicle-system-depend,source=/autoware/src/universe/autoware.universe/system,target=/autoware/src/universe/autoware.universe/system \
362-
--mount=type=bind,from=rosdep-universe-vehicle-system-depend,source=/autoware/src/universe/autoware.universe/map/autoware_map_height_fitter,target=/autoware/src/universe/autoware.universe/map/autoware_map_height_fitter \
363-
--mount=type=bind,from=rosdep-universe-vehicle-system-depend,source=/autoware/src/universe/autoware.universe/localization/autoware_pose2twist,target=/autoware/src/universe/autoware.universe/localization/autoware_pose2twist \
360+
--mount=type=bind,source=src/universe/autoware.universe/vehicle,target=/autoware/src/universe/autoware.universe/vehicle \
361+
--mount=type=bind,source=src/universe/autoware.universe/system,target=/autoware/src/universe/autoware.universe/system \
362+
--mount=type=bind,source=src/universe/autoware.universe/map/autoware_map_height_fitter,target=/autoware/src/universe/autoware.universe/map/autoware_map_height_fitter \
363+
--mount=type=bind,source=src/universe/autoware.universe/localization/autoware_pose2twist,target=/autoware/src/universe/autoware.universe/localization/autoware_pose2twist \
364364
source /opt/ros/"$ROS_DISTRO"/setup.bash \
365365
&& source /opt/autoware/setup.bash \
366366
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
@@ -384,7 +384,7 @@ RUN --mount=type=ssh \
384384

385385
# hadolint ignore=SC1091
386386
RUN --mount=type=cache,target=${CCACHE_DIR} \
387-
--mount=type=bind,from=rosdep-universe-visualization-depend,source=/autoware/src/universe/autoware.universe/visualization,target=/autoware/src/universe/autoware.universe/visualization \
387+
--mount=type=bind,source=src/universe/autoware.universe/visualization,target=/autoware/src/universe/autoware.universe/visualization \
388388
source /opt/ros/"$ROS_DISTRO"/setup.bash \
389389
&& source /opt/autoware/setup.bash \
390390
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware
@@ -413,15 +413,15 @@ COPY --from=universe-vehicle-system-devel /opt/autoware /opt/autoware
413413
COPY --from=universe-visualization-devel /opt/autoware /opt/autoware
414414
# hadolint ignore=SC1091
415415
RUN --mount=type=cache,target=${CCACHE_DIR} \
416-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/launcher,target=/autoware/src/launcher \
417-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/param,target=/autoware/src/param \
418-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/sensor_component,target=/autoware/src/sensor_component \
419-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/sensor_kit,target=/autoware/src/sensor_kit \
420-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/universe/autoware.universe/evaluator,target=/autoware/src/universe/autoware.universe/evaluator \
421-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/universe/autoware.universe/launch,target=/autoware/src/universe/autoware.universe/launch \
422-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/universe/autoware.universe/simulator,target=/autoware/src/universe/autoware.universe/simulator \
423-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/universe/autoware.universe/tools,target=/autoware/src/universe/autoware.universe/tools \
424-
--mount=type=bind,from=rosdep-universe-depend,source=/autoware/src/vehicle,target=/autoware/src/vehicle \
416+
--mount=type=bind,source=src/launcher,target=/autoware/src/launcher \
417+
--mount=type=bind,source=src/param,target=/autoware/src/param \
418+
--mount=type=bind,source=src/sensor_component,target=/autoware/src/sensor_component \
419+
--mount=type=bind,source=src/sensor_kit,target=/autoware/src/sensor_kit \
420+
--mount=type=bind,source=src/universe/autoware.universe/evaluator,target=/autoware/src/universe/autoware.universe/evaluator \
421+
--mount=type=bind,source=src/universe/autoware.universe/launch,target=/autoware/src/universe/autoware.universe/launch \
422+
--mount=type=bind,source=src/universe/autoware.universe/simulator,target=/autoware/src/universe/autoware.universe/simulator \
423+
--mount=type=bind,source=src/universe/autoware.universe/tools,target=/autoware/src/universe/autoware.universe/tools \
424+
--mount=type=bind,source=src/vehicle,target=/autoware/src/vehicle \
425425
source /opt/ros/"$ROS_DISTRO"/setup.bash \
426426
&& source /opt/autoware/setup.bash \
427427
&& /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware

0 commit comments

Comments
 (0)