diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 5308887a5e..0cda8d1956 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -15,7 +15,7 @@ libignition-tools-dev libignition-transport11-dev libignition-utils1-cli-dev libogre-1.9-dev -libogre-2.1-dev +libogre-2.2-dev libprotobuf-dev libprotoc-dev libsdformat12-dev diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index e84976b01d..ac03a69978 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -11,10 +11,6 @@ RUN scripts/enable_ign_stable.sh COPY docker/scripts/install_common_deps.sh scripts/install_common_deps.sh RUN scripts/install_common_deps.sh -# This is not strictly necessary, but makes things faster down the line. -COPY docker/scripts/install_ign_deps.sh scripts/install_ign_deps.sh -RUN scripts/install_ign_deps.sh - COPY docker/scripts/enable_gcc8.sh scripts/enable_gcc8.sh RUN scripts/enable_gcc8.sh diff --git a/docker/scripts/install_ign_deps.sh b/docker/scripts/install_ign_deps.sh deleted file mode 100755 index 63948f5fb6..0000000000 --- a/docker/scripts/install_ign_deps.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash - -set -o errexit -set -o verbose - -sudo apt-get update - -# Things that are used all over the ign stack -sudo apt-get install --no-install-recommends -y \ - doxygen \ - libbullet-dev \ - libtinyxml2-dev \ - libprotoc-dev libprotobuf-dev \ - protobuf-compiler \ - ruby-ronn \ - ruby-dev \ - swig \ - uuid-dev - -# ign-common dependencies -sudo apt-get install --no-install-recommends -y \ - libavcodec-dev \ - libavdevice-dev \ - libavformat-dev \ - libavutil-dev \ - libfreeimage-dev \ - libgts-dev \ - libswscale-dev - -# ign-gui dependencies -sudo apt-get install --no-install-recommends -y \ - qtbase5-dev \ - qtdeclarative5-dev \ - qtquickcontrols2-5-dev \ - qml-module-qtquick2 \ - qml-module-qtquick-controls \ - qml-module-qtquick-controls2 \ - qml-module-qtquick-dialogs \ - qml-module-qtquick-layouts \ - qml-module-qt-labs-folderlistmodel \ - qml-module-qt-labs-settings \ - qml-module-qtgraphicaleffects - -# ign-rendering dependencies -sudo apt-get install --no-install-recommends -y \ - libogre-1.9-dev \ - libogre-2.1-dev \ - libglew-dev \ - libfreeimage-dev \ - freeglut3-dev \ - libxmu-dev \ - libxi-dev - -# ign-transport dependencies -sudo apt-get install --no-install-recommends -y \ - libzmq3-dev \ - libsqlite3-dev - -# SDFormat dependencies -sudo apt-get install --no-install-recommends -y \ - libtinyxml-dev libxml2-dev - -# ign-fuel_tools dependencies -sudo apt-get install --no-install-recommends -y \ - libcurl4-openssl-dev libjsoncpp-dev libzip-dev curl libyaml-dev - -# ign-physics dependencies -sudo apt-get install --no-install-recommends -y \ - libeigen3-dev \ - libdart-collision-ode-dev \ - libdart-dev \ - libdart-external-ikfast-dev \ - libdart-external-odelcpsolver-dev \ - libdart-utils-urdf-dev \ - libbenchmark-dev - -# ign-gazebo dependencies -sudo apt-get install --no-install-recommends -y \ - qml-module-qtqml-models2 - -sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/* -