Skip to content

Commit f5d2da8

Browse files
committed
Dockerfiels psutil update
1 parent 595157a commit f5d2da8

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

Docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ RUN sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python && sudo ln -sf
5656
RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/docker/.bashrc
5757

5858
# pybullet, robot_description, numpy, etc.
59-
RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install pybullet "numpy<2" scipy cython matplotlib roboticstoolbox-python --ignore-installed --verbose --no-cache-dir
59+
RUN apt remove python3-psutil -y
60+
RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install psutil pybullet "numpy<2" scipy cython matplotlib roboticstoolbox-python --ignore-installed --no-cache-dir
6061
RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user
61-
RUN python$PYTHON_VER -m pip install psutil --force-reinstall
6262

6363
# Delete thingies from aptitude
6464
RUN rm -Rf /var/lib/apt/lists/*

Docker/Dockerfile.gitpod

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ RUN cd /opt && wget https://download.jetbrains.com/python/pycharm-community-$PYC
7474
# Manage ports
7575
EXPOSE 5901 6080 8888 10000/tcp 10000/udp
7676

77-
RUN python$PYTHON_VER -m pip install --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython open3d pybullet roboticstoolbox-python --ignore-installed
78-
RUN python$PYTHON_VER -m pip install psutil --force-reinstall
77+
RUN apt remove python3-psutil -y
78+
RUN python$PYTHON_VER -m pip install --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython open3d pybullet roboticstoolbox-python psutil --ignore-installed --no-cache-dir
7979

8080
#Add gitpod user with correct UID and GID; and add him to sudoers
8181
RUN useradd -l -u 33333 -G sudo -md /home/gitpod -s /bin/bash gitpod && \

Docker/Dockerfile.vnc

+2-3
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,8 @@ RUN cd /opt && wget https://download.jetbrains.com/python/pycharm-community-$PYC
7474
# Manage ports
7575
EXPOSE 5901 6080 8888 10000/tcp 10000/udp
7676

77-
RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython open3d pybullet roboticstoolbox-python --ignore-installed
78-
RUN python$PYTHON_VER -m pip install psutil --force-reinstall
79-
77+
RUN apt remove python3-psutil -y
78+
RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython psutil open3d pybullet roboticstoolbox-python --ignore-installed --no-cache-dir
8079

8180
#Add docker user with correct UID and GID; and add him to sudoers
8281
RUN useradd -l -u 33333 -G sudo -md /home/docker -s /bin/bash docker && \

0 commit comments

Comments
 (0)