diff options
author | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
---|---|---|
committer | ROUVREAU Vincent <vincent.rouvreau@inria.fr> | 2020-03-22 11:06:52 +0100 |
commit | cd47fa8e718f6ede07aead032d524022bd68b608 (patch) | |
tree | 5c451ce83cff35c8962f2a06da5f950eb91ce1dc /Dockerfile_for_circleci_image | |
parent | 6225d21fa6fd87edf10731df87cd3a7099049358 (diff) | |
parent | 49f9e5cc6bf933705500ad96d674df6a9df7f713 (diff) |
Merge master and resolve conflicts
Diffstat (limited to 'Dockerfile_for_circleci_image')
-rw-r--r-- | Dockerfile_for_circleci_image | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/Dockerfile_for_circleci_image b/Dockerfile_for_circleci_image index ebd2f366..1eededb5 100644 --- a/Dockerfile_for_circleci_image +++ b/Dockerfile_for_circleci_image @@ -30,7 +30,7 @@ RUN apt-get install -y make \ cmake \ graphviz \ perl \ - texlive-bibtex-extra \ + texlive-full \ biber \ doxygen \ libboost-all-dev \ @@ -42,24 +42,16 @@ RUN apt-get install -y make \ locales \ python3 \ python3-pip \ - python3-pytest \ python3-tk \ - python3-pybind11 \ libfreetype6-dev \ - pkg-config + pkg-config \ + curl -RUN pip3 install \ - setuptools \ - numpy \ - matplotlib \ - scipy \ - Cython \ - POT \ - scikit-learn \ - sphinx \ - sphinx-paramlinks \ - sphinxcontrib-bibtex \ - tensorflow +ADD .github/build-requirements.txt / +ADD .github/test-requirements.txt / + +RUN pip3 install -r build-requirements.txt +RUN pip3 install -r test-requirements.txt # apt clean up RUN apt autoremove && rm -rf /var/lib/apt/lists/* |