diff --git a/Dockerfile b/Dockerfile index 6f83d51..f2909bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,25 +52,8 @@ COPY --chown=carma package.xml /home/carma/.base-image/workspace/src/carma_base/ COPY --chown=carma entrypoint.sh init-env.sh /home/carma/.base-image/ COPY --chown=carma ./code_coverage /home/carma/.ci-image/engineering_tools/code_coverage -# Layer for installing dependencies -# NOTE: Sonarcloud does not seem to support ARM, further investigation needed -RUN apt-get update && \\ - sed -i 's|http://archive.ubuntu.com|http://us.archive.ubuntu.com|g' /etc/apt/sources.list && \ - # Download a cmake module for PROJ, needed for lanelet2_extension, autoware_lanelet2_ros_interface, and maybe more - curl --output /usr/share/cmake-3.16/Modules/FindPROJ4.cmake https://raw.githubusercontent.com/mloskot/cmake-modules/master/modules/FindPROJ4.cmake && \ - # Install version 45.2.0 for setuptools since that is the latest version available for ubuntu focal - # Version match is needed to build some of the packages - pip3 install --no-cache-dir setuptools==45.2.0 simple-pid && \ - # FIXME: The following symlink will no longer be required once images - # that depend on carma-base change from wait-for-it.sh to wait-for-it - ln -s /usr/bin/wait-for-it /usr/bin/wait-for-it.sh && \ - # Install Java 17 - apt-get install -y openjdk-17-jdk && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - # Layer for building ROS2 Humble packages from source -# NOTICE: needs to be chmod +x +# NOTICE: needs to be chmod +x on host if not already COPY install_pkgs.sh install_pkgs.sh RUN ./install_pkgs.sh