Fortress: Install Ogre 2.2, simplify docker (#1395)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Mar 25, 2022 · 9b07b24 · 9b07b24
1 parent c02e140
commit 9b07b24
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 87 deletions.
diff --git 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
@@ -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