diff --git a/README.rst b/README.rst index b59456531..aef7aae2b 100644 --- a/README.rst +++ b/README.rst @@ -121,6 +121,7 @@ Before building on Linux systems you must install the following packages: .. code-block :: bash sudo apt-get install build-essential libgl1-mesa-dev libxt-dev + sudo apt-get libx11-xcb-dev libxcb1-dev libxcb-glx0-dev libxkbcommon-x11-dev sudo apt-get install libexpat1-dev libgtk2.0-dev liblapack-dev On Linux, to optionally build with Python and to build the user documentation, @@ -128,7 +129,7 @@ you will also need to install the following: .. code-block :: bash - sudo apt-get install python3-dev python3-sphinx-rtd-theme + sudo apt-get install python3-dev python3-sphinx python3-sphinx-rtd-theme Set up the folder structure and obtain the source files. This can be done with git or by downloading the files and extracting them. Then setup the folder(s) diff --git a/packaging/Dockerfile b/packaging/Dockerfile index bae16a0e0..f77cb910b 100644 --- a/packaging/Dockerfile +++ b/packaging/Dockerfile @@ -15,13 +15,22 @@ ARG branch=release # Install required system packages to build TeleSculptor # Everything else is built from Fletch -RUN apt-get update && apt-get install -y --no-install-recommends \ -build-essential file git cmake \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive \ +apt-get install -y --no-install-recommends \ +build-essential file git \ wget automake \ libgl1-mesa-dev libxt-dev libexpat1-dev libgtk2.0-dev liblapack-dev \ -python3-dev python3-docutils && \ +libx11-xcb-dev libxcb1-dev libxcb-glx0-dev libxkbcommon-x11-dev \ +python3-dev python3-sphinx python3-sphinx-rtd-theme && \ rm -rf /var/lib/apt/lists/* +# Install CMake 3.15 +RUN wget --no-check-certificate \ +https://github.com/Kitware/CMake/releases/download/v3.15.1/cmake-3.15.1-Linux-x86_64.sh \ +&& chmod +x cmake-3.15.1-Linux-x86_64.sh \ +&& ./cmake-3.15.1-Linux-x86_64.sh --skip-license \ +&& rm -rf cmake-3.15.1-Linux-x86_64.sh + # Set Python3 as the default # Make sure `python` is available and calls `python3` # Some build steps fail without `python` available