diff --git a/containers/autoware-devel/Dockerfile b/containers/autoware-devel/Dockerfile index 02d74a2..56aaa0b 100644 --- a/containers/autoware-devel/Dockerfile +++ b/containers/autoware-devel/Dockerfile @@ -26,6 +26,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM} apt-get update -qq && \ apt-get install -qy --no-install-recommends \ sudo \ + curl \ wget \ gnupg2 \ ca-certificates \ @@ -51,10 +52,10 @@ RUN groupadd bounverif -g 1000 && \ ENV ROS_DISTRO=humble ENV AUTOWARE_DEVEL_ROOT=/root/autoware -ENV AUTOWARE_DEVEL_SOURCE_DIR=/root/autoware/src -ENV AUTOWARE_DEVEL_BUILD_DIR=/root/autoware/build -ENV AUTOWARE_DEVEL_INSTALL_DIR=/root/autoware/autoware -ENV AUTOWARE_DEVEL_DATA_DIR=/root/autoware/data +ENV AUTOWARE_DEVEL_SOURCE_DIR=${AUTOWARE_DEVEL_ROOT}/src +ENV AUTOWARE_DEVEL_BUILD_DIR=${AUTOWARE_DEVEL_ROOT}/build +ENV AUTOWARE_DEVEL_INSTALL_DIR=${AUTOWARE_DEVEL_ROOT}/install +ENV AUTOWARE_DEVEL_DATA_DIR=${AUTOWARE_DEVEL_ROOT}/data ARG AUTOWARE_VERSION ENV AUTOWARE_VERSION=${AUTOWARE_VERSION:-latest} @@ -72,10 +73,15 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM} python3-vcstool \ && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* -COPY etc/autoware/autoware.repos.yml /etc/autoware/autoware.repos.yml - -RUN mkdir -p ${AUTOWARE_DEVEL_SOURCE_DIR} && \ - vcs import --shallow ${AUTOWARE_DEVEL_SOURCE_DIR} < /etc/autoware/autoware.repos.yml +RUN git clone https://github.com/autowarefoundation/autoware --depth=1 ${AUTOWARE_DEVEL_ROOT} && \ + mkdir -p ${AUTOWARE_DEVEL_SOURCE_DIR} && \ + vcs import ${AUTOWARE_DEVEL_SOURCE_DIR}\ + --shallow \ + --input ${AUTOWARE_DEVEL_ROOT}/autoware.repos \ + && \ + rm -rf ${AUTOWARE_DEVEL_SOURCE_DIR}/universe/external/morai_msgs && \ + rm -rf ${AUTOWARE_DEVEL_SOURCE_DIR}/vehicle && \ + du --human-readable --max-depth 2 ${AUTOWARE_DEVEL_SOURCE_DIR} FROM ${IMAGE_NAME}:${AUTOWARE_VERSION}-base AS autoware-builder ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT @@ -94,7 +100,6 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM} python3-rosdep \ python3-colcon-core \ python3-colcon-common-extensions \ - ansible-core \ && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* # CUDA Toolkit Installation @@ -166,7 +171,7 @@ RUN --mount=type=bind,from=autoware-source,source=${AUTOWARE_DEVEL_SOURCE_DIR},t console_stderr+ \ console_cohesion- \ console_start_end- \ - console_package_list- \ + console_package_list+ \ status- \ summary+ \ desktop_notification- \ diff --git a/etc/autoware/autoware.repos.yml b/etc/autoware/autoware.repos.yml deleted file mode 100644 index 828707d..0000000 --- a/etc/autoware/autoware.repos.yml +++ /dev/null @@ -1,137 +0,0 @@ -repositories: - # core - core/autoware_msgs: - type: git - url: https://github.com/autowarefoundation/autoware_msgs.git - version: 1.1.0 - core/autoware_adapi_msgs: - type: git - url: https://github.com/autowarefoundation/autoware_adapi_msgs.git - version: 1.3.0 - core/autoware_internal_msgs: - type: git - url: https://github.com/autowarefoundation/autoware_internal_msgs.git - version: 1.1.0 - # TODO(youtalk): Remove autoware_common when https://github.com/autowarefoundation/autoware/issues/4911 is closed - core/autoware_common: - type: git - url: https://github.com/autowarefoundation/autoware_common.git - version: remove-autoware-cmake-utils - core/autoware_cmake: - type: git - url: https://github.com/autowarefoundation/autoware_cmake.git - version: 1.0.0 - core/autoware_utils: - type: git - url: https://github.com/autowarefoundation/autoware_utils.git - version: 1.0.0 - core/autoware_lanelet2_extension: - type: git - url: https://github.com/autowarefoundation/autoware_lanelet2_extension.git - version: 0.6.0 - core/autoware.core: - type: git - url: https://github.com/autowarefoundation/autoware.core.git - version: main - # universe - universe/autoware.universe: - type: git - url: https://github.com/autowarefoundation/autoware.universe.git - version: main - universe/external/tier4_ad_api_adaptor: # TODO(TIER IV): Improve design/code and transfer to AWF - type: git - url: https://github.com/tier4/tier4_ad_api_adaptor.git - version: tier4/universe - universe/external/tier4_autoware_msgs: - type: git - url: https://github.com/tier4/tier4_autoware_msgs.git - version: tier4/universe - universe/external/morai_msgs: - type: git - url: https://github.com/MORAI-Autonomous/MORAI-ROS2_morai_msgs.git - version: main - universe/external/muSSP: - type: git - url: https://github.com/tier4/muSSP.git - version: tier4/main - universe/external/ndt_omp: - type: git - url: https://github.com/tier4/ndt_omp.git - version: tier4/main - universe/external/pointcloud_to_laserscan: - type: git - url: https://github.com/tier4/pointcloud_to_laserscan.git - version: tier4/main - universe/external/eagleye: - type: git - url: https://github.com/MapIV/eagleye.git - version: autoware-main - universe/external/rtklib_ros_bridge: - type: git - url: https://github.com/MapIV/rtklib_ros_bridge.git - version: ros2-v0.1.0 - universe/external/llh_converter: - type: git - url: https://github.com/MapIV/llh_converter.git - version: ros2 - universe/external/ament_cmake: # TODO(mitsudome-r): remove when https://github.com/ament/ament_cmake/pull/448 is merged - type: git - url: https://github.com/autowarefoundation/ament_cmake.git - version: feat/faster_ament_libraries_deduplicate - universe/external/glog: # TODO(Horibe): to use isGoogleInitialized() API in v0.6.0. Remove when the rosdep glog version is updated to v0.6.0 (already updated in Ubuntu 24.04) - type: git - url: https://github.com/tier4/glog.git - version: v0.6.0_t4-ros - # launcher - launcher/autoware_launch: - type: git - url: https://github.com/autowarefoundation/autoware_launch.git - version: main - # sensor_component - sensor_component/external/sensor_component_description: - type: git - url: https://github.com/tier4/sensor_component_description.git - version: main - sensor_component/external/tamagawa_imu_driver: - type: git - url: https://github.com/tier4/tamagawa_imu_driver.git - version: ros2 - sensor_component/external/nebula: - type: git - url: https://github.com/tier4/nebula.git - version: main - sensor_component/external/transport_drivers: - type: git - url: https://github.com/MapIV/transport_drivers.git - version: boost - # sensor_kit - sensor_kit/sample_sensor_kit_launch: - type: git - url: https://github.com/autowarefoundation/sample_sensor_kit_launch.git - version: main - # sensor_kit/external/awsim_sensor_kit_launch: # TODO: Integrate into sample_sensor_kit_launch - # type: git - # url: https://github.com/RobotecAI/awsim_sensor_kit_launch.git - # version: main - # sensor_kit/awsim_labs_sensor_kit_launch: - # type: git - # url: https://github.com/autowarefoundation/awsim_labs_sensor_kit_launch.git - # version: main - # vehicle - # vehicle/sample_vehicle_launch: - # type: git - # url: https://github.com/autowarefoundation/sample_vehicle_launch.git - # version: main - # vehicle/external/pacmod_interface: - # type: git - # url: https://github.com/tier4/pacmod_interface.git - # version: main - # vehicle/external/pacmod3_msgs: - # type: git - # url: https://github.com/astuff/pacmod3_msgs.git - # version: 1.0.0 - # param - param/autoware_individual_params: - type: git - url: https://github.com/autowarefoundation/autoware_individual_params.git - version: main \ No newline at end of file