Skip to content

Commit 6702a1f

Browse files
bakpaulbakpaul
committed
Fix compilation of docker files
1 parent b359e82 commit 6702a1f

2 files changed

Lines changed: 5 additions & 63 deletions

File tree

‎docker/sofabuilder_fedora/Dockerfile‎

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -62,19 +62,14 @@ RUN yum install -y -q \
6262

6363
# Install pip, numpy, scipy, pybind11
6464
ARG PYBIND11_VERSION=2.11.1
65-
#RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \
66-
# && python2.7 /tmp/get-pip2.py \
67-
# && python2.7 -m pip install --upgrade "pip == 20.3.4" \
68-
# && python2.7 -m pip install "numpy == 1.16.6" "scipy == 1.2.3" "matplotlib == 2.2.5"
69-
#RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py
70-
#RUN python3.10 /tmp/get-pip3.py
71-
RUN python3.10 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION rpyc prettytable Cheetah3
65+
RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
66+
&& python3.10 /tmp/get-pip3.py \
67+
&& python3.10 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen rpyc prettytable Cheetah3
7268
RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
7369
&& python3.11 /tmp/get-pip3.py \
7470
&& python3.11 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION rpyc prettytable Cheetah3
75-
RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
76-
&& python3.12 /tmp/get-pip3.py \
77-
&& python3.12 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION rpyc prettytable Cheetah3
71+
RUN python3.12 -m ensurepip --upgrade \
72+
&& python3.12 -m pip install numpy==1.26.4
7873
ENV PYTHONPATH=""
7974
ENV VM_HAS_ASSIMP="true"
8075
ENV VM_HAS_OPENCASCADE="false"
@@ -87,19 +82,6 @@ ADD https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CM
8782
RUN chmod a+x /tmp/cmake.sh
8883
RUN /tmp/cmake.sh --skip-license --prefix=/usr/local
8984

90-
# Install Qt
91-
ARG QT_VERSION=5.12.12
92-
ARG QT_INSTALLDIR="/opt/Qt"
93-
RUN python3.10 -m pip install aqtinstall \
94-
&& python3.10 -m aqt install-qt --outputdir $QT_INSTALLDIR linux desktop $QT_VERSION gcc_64 -m qtcharts qtwebengine
95-
RUN yum install -y -q libxkbcommon-x11 libwayland-cursor xcb-util-* \
96-
&& python3.10 -m aqt install-tool --outputdir $QT_INSTALLDIR linux desktop tools_ifw \
97-
|| true
98-
ENV QT_INSTALLDIR="$QT_INSTALLDIR"
99-
ENV QTDIR="$QT_INSTALLDIR/$QT_VERSION/gcc_64"
100-
ENV LD_LIBRARY_PATH="$QTDIR/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
101-
ENV PATH="$QTDIR/bin${PATH:+:${PATH}}"
102-
10385
# Install Boost
10486
RUN yum install -y -q boost-devel
10587
ENV BOOST_INCLUDEDIR="/usr/include"
@@ -122,14 +104,6 @@ RUN tar -xJf /tmp/CGAL.tar.xz --directory /tmp \
122104
ENV VM_HAS_CGAL="true"
123105
ENV VM_CGAL_PATH="/usr/local/lib64/cmake/CGAL"
124106

125-
126-
# Install METIS
127-
#RUN git clone https://github.com/sofa-framework/METIS.git \
128-
# && cd METIS \
129-
# && git checkout v5.2.1-ModernInstall \
130-
# && cd .. && mkdir build && cd build \
131-
# && cmake ../METIS \
132-
# && make --silent install -j 5
133107
###################################
134108

135109
# Disable core dumps

‎docker/sofabuilder_ubuntu/Dockerfile‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,6 @@ RUN apt-get install -y \
6969
ENV VM_BUILDS_IMGUI="true"
7070
# Install pip, numpy, scipy, pybind11
7171
ARG PYBIND11_VERSION=2.12.0
72-
RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \
73-
&& python2.7 /tmp/get-pip2.py \
74-
&& python2.7 -m pip install --upgrade "pip == 20.3.4" \
75-
&& python2.7 -m pip install "numpy == 1.16.6" "scipy == 1.2.3" "matplotlib == 2.2.5"
7672
RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
7773
&& python3.10 /tmp/get-pip3.py \
7874
&& python3.10 -m pip install --upgrade pip \
@@ -96,18 +92,6 @@ ADD https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CM
9692
RUN chmod a+x /tmp/cmake.sh
9793
RUN /tmp/cmake.sh --skip-license --prefix=/usr/local
9894

99-
# Install Qt
100-
ARG QT_VERSION=5.12.12
101-
ARG QT_INSTALLDIR="/opt/Qt"
102-
RUN python3.10 -m pip install aqtinstall \
103-
&& python3.10 -m aqt install-qt --outputdir $QT_INSTALLDIR linux desktop $QT_VERSION gcc_64 -m qtcharts qtwebengine
104-
RUN apt-get install -y libxkbcommon-x11-0 libwayland-cursor0 libxcb-* \
105-
&& python3.10 -m aqt install-tool --outputdir $QT_INSTALLDIR linux desktop tools_ifw \
106-
|| true
107-
ENV QT_INSTALLDIR="$QT_INSTALLDIR"
108-
ENV QTDIR="$QT_INSTALLDIR/$QT_VERSION/gcc_64"
109-
ENV LD_LIBRARY_PATH="$QTDIR/lib${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
110-
ENV PATH="$QTDIR/bin${PATH:+:${PATH}}"
11195

11296
# Install CGAL
11397
# Due to dependencies on Boost and Qt, we have to build CGAL
@@ -123,15 +107,6 @@ RUN tar -xJf /tmp/CGAL.tar.xz --directory /tmp \
123107
ENV VM_HAS_CGAL="true"
124108
ENV VM_CGAL_PATH="/usr/local/lib/cmake/CGAL"
125109

126-
127-
# Install METIS
128-
#RUN git clone https://github.com/sofa-framework/METIS.git \
129-
# && cd METIS \
130-
# && git checkout v5.2.1-ModernInstall \
131-
# && cd .. && mkdir build && cd build \
132-
# && cmake ../METIS && cmake -LAH | grep GKRAND\
133-
# && make --silent install -j 5
134-
135110
# Install CUDA
136111
ENV DEBIAN_FRONTEND noninteractive
137112
RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb
@@ -142,13 +117,6 @@ ENV VM_HAS_CUDA="true"
142117
ENV PATH=$PATH:/usr/local/cuda/bin
143118

144119

145-
# Install NodeEditor (needed by SofaQtQuick)
146-
ARG NODEEDITOR_VERSION=2.2.4
147-
RUN git clone -b $NODEEDITOR_VERSION --depth 1 https://github.com/paceholder/nodeeditor.git /tmp/nodeeditor/src \
148-
&& mkdir /tmp/nodeeditor/build && cd /tmp/nodeeditor/build \
149-
&& cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF ../src \
150-
&& make --silent install
151-
152120
###################################
153121

154122
# Disable core dumps

0 commit comments

Comments
 (0)