Skip to content

Commit

Permalink
Merge pull request #535 from mleotta/dev/fix-docker-build
Browse files Browse the repository at this point in the history
Fix docker build
  • Loading branch information
mleotta authored Sep 20, 2021
2 parents d5546c3 + 23cb12b commit 1fd36a9
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,15 @@ 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,
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)
Expand Down
15 changes: 12 additions & 3 deletions packaging/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1fd36a9

Please sign in to comment.