diff --git a/Dockerfile.openpilot_base b/Dockerfile.openpilot_base index a5028d4347..6dbd249c23 100644 --- a/Dockerfile.openpilot_base +++ b/Dockerfile.openpilot_base @@ -13,7 +13,7 @@ ENV LANGUAGE en_US:en ENV LC_ALL en_US.UTF-8 COPY tools/install_ubuntu_dependencies.sh /tmp/tools/ -RUN INSTALL_EXTRA_PACKAGES=no /tmp/tools/install_ubuntu_dependencies.sh && \ +RUN /tmp/tools/install_ubuntu_dependencies.sh && \ rm -rf /var/lib/apt/lists/* /tmp/* && \ cd /usr/lib/gcc/arm-none-eabi/* && \ rm -rf arm/ thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp diff --git a/tools/install_ubuntu_dependencies.sh b/tools/install_ubuntu_dependencies.sh index 1b4fa0581a..be5c479c36 100755 --- a/tools/install_ubuntu_dependencies.sh +++ b/tools/install_ubuntu_dependencies.sh @@ -66,21 +66,6 @@ function install_ubuntu_common_requirements() { libqt5opengl5-dev } -# Install extra packages -function install_extra_packages() { - echo "Installing extra packages..." - $SUDO apt-get install -y --no-install-recommends \ - libreadline-dev \ - libdw1 \ - autoconf \ - libtool \ - bzip2 \ - libarchive-dev \ - libncursesw5-dev \ - libportaudio2 \ - locales -} - # Install Ubuntu 24.04 LTS packages function install_ubuntu_lts_latest_requirements() { install_ubuntu_common_requirements @@ -129,18 +114,6 @@ if [ -f "/etc/os-release" ]; then fi esac - # Install extra packages - if [[ -z "$INSTALL_EXTRA_PACKAGES" && -n "$INTERACTIVE" ]]; then - read -p "Base setup done. Do you want to install extra development packages? [Y/n]: " -n 1 -r - echo "" - if [[ $REPLY =~ ^[Yy]$ ]]; then - INSTALL_EXTRA_PACKAGES="yes" - fi - fi - if [[ "$INSTALL_EXTRA_PACKAGES" == "yes" ]]; then - install_extra_packages - fi - if [[ -d "/etc/udev/rules.d/" ]]; then # Setup panda udev rules $SUDO tee /etc/udev/rules.d/12-panda_jungle.rules > /dev/null <