From ce62fd9df4974cf28c3b4612812acfd5d6036b73 Mon Sep 17 00:00:00 2001 From: Faraz Fallahi Date: Tue, 26 Jan 2021 22:35:55 -0500 Subject: [PATCH] update --- Dockerfile | 8 +++++--- Dockerfile.static | 2 +- README.md | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 538d0a2..07c9c4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,9 @@ RUN \ apt -y install \ bash build-essential ccache clang clang-format clang-tidy cmake cppcheck curl doxygen gdb git gnupg gperf iputils-ping \ libboost-all-dev libfcgi-dev libgl1-mesa-dev libjemalloc-dev libjemalloc2 libmlpack-dev libtbb-dev libyaml-cpp-dev \ - linux-tools-generic nano nasm ninja-build openssh-server pkg-config python3-pip qt5-default spawn-fcgi sudo tini \ - unzip valgrind wget zip && \ - apt-get install -y --no-install-recommends libx11-xcb-dev libxcb-dri3-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-xkb-dev xorg-dev && \ + linux-tools-generic nano nasm ninja-build openjdk-11-jdk openssh-server pkg-config python3-pip qt5-default spawn-fcgi \ + sudo tini unzip valgrind wget zip && \ + apt -y install --no-install-recommends libx11-xcb-dev libxcb-dri3-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-render0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinerama0-dev libxcb-xkb-dev xorg-dev && \ apt -y autoremove && \ apt -y autoclean && \ apt -y clean && \ @@ -20,6 +20,8 @@ RUN \ RUN \ set -eux && \ pip3 install autoenv autopep8 cmake-format conan conan_package_tools setuptools && \ + pip3 install cppclean flawfinder lizard && \ + pip3 install dlib ipython jupyter matplotlib nose numpy pandas pymc3 scikit-learn scipy seaborn sympy && \ exit 0 RUN \ diff --git a/Dockerfile.static b/Dockerfile.static index 98661c3..6b5bb66 100644 --- a/Dockerfile.static +++ b/Dockerfile.static @@ -1,5 +1,4 @@ FROM ubuntu:20.04 -ENTRYPOINT ["/bin/bash"] RUN \ export DEBIAN_FRONTEND=noninteractive && \ @@ -37,3 +36,4 @@ RUN \ exit 0 ENV PATH="${PATH}:/usr/local/Qt-5.15.2/bin" +ENTRYPOINT ["/bin/bash"] diff --git a/README.md b/README.md index dbff116..5b1baa1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ C++ Qt compile environment for Docker (Dynamically Linked, Statically Linked, an * Linux Dynamically Linked ``` docker build --force-rm -f Dockerfile -t fffaraz/qt:latest . -docker run --rm -it -v $(pwd):/app fffaraz/qt:latest +docker run --rm -it -v $(pwd):/app fffaraz/qt:latest /bin/bash ``` * Linux Statically Linked