Skip to content

Commit

Permalink
Update install and dockerfile
Browse files Browse the repository at this point in the history
Signed-off-by: Alberto Tudela <ajtudela@gmail.com>
  • Loading branch information
ajtudela committed May 29, 2024
1 parent 7509822 commit 986a601
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ ARG robocomp_version="dsr"
FROM ${base_image}:${base_tag} AS dependencies-version
# Disable Prompt During Packages Installation
ARG DEBIAN_FRONTEND=noninteractive
ENV TZ=Europe/Madrid
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
ARG branch
# DEFAULT LD_LIBRARY_PATH vaiables from the nvidia/opengl image confuses pyside2 about the qt5 Library paths
ENV LD_LIBRARY_PATH="/lib:/usr/lib"
Expand Down Expand Up @@ -68,8 +70,6 @@ COPY Connection.h /usr/include/Ice/Connection.h

### Third party dependencies
RUN curl -S https://raw.githubusercontent.com/grupo-avispa/cortex/development/installation.sh | bash -x
RUN rm -r /usr/local/include/cppitertools
RUN git clone https://github.com/ryanhaining/cppitertools /usr/local/include/cppitertools
USER demo


Expand Down
11 changes: 6 additions & 5 deletions tools/install/robocomp_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ branch="${branch:-development}"
source <(curl -sL https://raw.githubusercontent.com/grupo-avispa/robocomp/$branch/tools/install/resources/robocomp_prerequisites_install.sh)

git clone -b $branch https://github.com/grupo-avispa/robocomp.git
sudo ln -s ~ /home/robocomp
echo "export ROBOCOMP=~/robocomp" >> ~/.bashrc
echo "export PATH=$PATH:/opt/robocomp/bin" >> ~/.bashrc
echo "export PYTHONIOENCODING=utf-8" >> ~/.bashrc
export ROBOCOMP=~/robocomp
echo "export ROBOCOMP=$HOME/robocomp" >> $HOME/.bashrc
echo "export PATH=/opt/robocomp/bin:$PATH" >> $HOME/.bashrc
echo "export PYTHONIOENCODING=utf-8" >> $HOME/.bashrc
echo "export LD_LIBRARY_PATH=/opt/robocomp/lib:$LD_LIBRARY_PATH" >> $HOME/.bashrc
export ROBOCOMP=$HOME/robocomp
export PATH=$PATH:/opt/robocomp/bin
export PYTHONIOENCODING=utf-8
sudo ln -s ${HOME} /home/robocomp
sudo [ -d /opt/robocomp ] && sudo rm -r /opt/robocomp
cd robocomp
sudo pip3 install tools/cli/
Expand Down

0 comments on commit 986a601

Please sign in to comment.