diff --git a/Dockerfile b/Dockerfile index 1ad617e4..4234c7b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,7 +63,11 @@ RUN apt update \ gobject-introspection \ libgtk-3-dev \ libcanberra-gtk-module \ - graphviz + graphviz\ + ninja-build + +RUN pip install meson + RUN if ! grep -q "VERSION_ID=\"22.04\"" /etc/os-release; then \ pip install setuptools; \ fi diff --git a/run b/run index f5c55968..316551ab 100755 --- a/run +++ b/run @@ -333,6 +333,12 @@ setup() { apt-get install --no-install-recommends -y libv4l-dev fi + # git + git_path=$(which git) + if [[ $git_path == "" ]]; then + echo "Installing git" + apt-get install --no-install-recommends -y git + fi # Install ngc-cli ngc_version=$(ngc --version 2>/dev/null | grep -Po '^NGC CLI \K[^-]*') @@ -373,10 +379,13 @@ setup() { install_cuda_dependencies_package libcudnn8-dev cuda$short_cuda_version fi - # Make sure we do not install any cuda12 packages - install_cuda_dependencies_package libnvinfer-dev cuda$short_cuda_version - install_cuda_dependencies_package libnvinfer-plugin-dev cuda$short_cuda_version - install_cuda_dependencies_package libnvonnxparsers-dev cuda$short_cuda_version + # Check the current version of libnvinfer-bin + installed_libnvinferbin=$(dpkg --status libnvinfer-bin 2>/dev/null | grep -Po '^Version: \K[^-]*') + installed_libnvinferbin_version=${installed_libnvinferbin%.*} + install_cuda_dependencies_package libnvinfer-headers-dev $installed_libnvinferbin_version + install_cuda_dependencies_package libnvinfer-dev $installed_libnvinferbin_version + install_cuda_dependencies_package libnvinfer-plugin-dev $installed_libnvinferbin_version + install_cuda_dependencies_package libnvonnxparsers-dev $installed_libnvinferbin_version # Install the autocomplete echo "Installing autocomplete"