From cbc937c1cd36e2086165061b7707b52c85f30f8b Mon Sep 17 00:00:00 2001 From: Peter Schafhalter Date: Sun, 10 Jul 2022 07:03:23 -0700 Subject: [PATCH] [Docker] Add ~/.local/bin to $PATH (#274) --- docker/Dockerfile | 5 ++++- install.sh | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 437841634..20e7d00e1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -45,7 +45,7 @@ ENV PATH="/home/erdos/.cargo/bin:${PATH}" RUN echo "export PATH=/home/erdos/.cargo/bin:${PATH}" >> ~/.bashrc RUN rustup default nightly RUN mkdir -p /home/erdos/workspace -RUN cd /home/erdos/workspace && git clone https://github.com/erdos-project/erdos.git && cd erdos && python3 python/setup.py install --user +RUN cd /home/erdos/workspace && git clone https://github.com/erdos-project/erdos.git && cd erdos && python3 python/setup.py install # Set up Pylot. RUN sudo apt-get install -y libcudnn8 cuda-toolkit-11-4 ssh libqt5core5a libeigen3-dev cmake qtbase5-dev libpng16-16 libtiff5 python3-tk python3-pygame libgeos-dev @@ -71,6 +71,9 @@ RUN echo "export PYLOT_HOME=/home/erdos/workspace/pylot/" >> ~/.bashrc RUN echo "export CARLA_HOME=/home/erdos/workspace/pylot/dependencies/CARLA_0.9.10.1" >> ~/.bashrc RUN echo "if [ -f ~/.bashrc ]; then . ~/.bashrc ; fi" >> ~/.bash_profile +# Add programs installed via PIP to the path. +RUN echo "export PATH=$HOME/.local/bin:${PATH}" >> ~/.bashrc + # Set up ssh access to the container. RUN cd ~/ && ssh-keygen -q -t rsa -N '' -f ~/.ssh/id_rsa <<&1 >/dev/null RUN sudo sed -i 's/#X11UseLocalhost yes/X11UseLocalhost no/g' /etc/ssh/sshd_config diff --git a/install.sh b/install.sh index 12e704f25..33b58bc4a 100755 --- a/install.sh +++ b/install.sh @@ -12,7 +12,7 @@ sudo apt-get install -y git wget cmake python3-pip unzip clang libpng-dev libgeo # Install opencv separately because pip3 install doesn't install all libraries # opencv requires. sudo apt-get install -y python3-opencv -python3 -m pip install --user gdown +python3 -m pip install user gdown # Install Pygame if available. PYGAME_PKG=`apt-cache search python3-pygame` if [ -n "$PYGAME_PKG" ] ; then @@ -77,7 +77,7 @@ git clone https://github.com/CharlesShang/DCNv2/ cd DCNv2 sudo apt-get install llvm-9 export LLVM_CONFIG=/usr/bin/llvm-config-9 -python3 setup.py build develop --user +python3 setup.py build develop user ###### Install QDTrack ###### cd $PYLOT_HOME/dependencies/