diff --git a/Dockerfile b/Dockerfile index 3b91879..7f32dc5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -159,8 +159,7 @@ echo "export ROS_PACKAGE_PATH=\${ROS_PACKAGE_PATH}:/home/ubuntu/catkin_ws" >> ~/.bashrc && \ echo "export ROS_WORKSPACE=/home/ubuntu/catkin_ws" >> ~/.bashrc && \ echo "alias cm='cd ~/catkin_ws;catkin build'" >> ~/.bashrc && \ - echo "alias cs='cd ~/catkin_ws/src'" >> ~/.bashrc && \ - echo "export NAOqi_DIR=/home/ubuntu/naoqi-sdk-2.5.5.5-linux64" >> ~/.bashrc + echo "alias cs='cd ~/catkin_ws/src'" >> ~/.bashrc RUN apt-get update && \ apt-get upgrade -y && \ @@ -191,13 +190,12 @@ RUN tar -xvzf /home/ubuntu/pynaoqi-python2.7-2.5.5.5-linux64.tar.gz -C /home/ubuntu/ && \ rm /home/ubuntu/pynaoqi-python2.7-2.5.5.5-linux64.tar.gz && \ tar -xvzf /home/ubuntu/naoqi-sdk-2.5.5.5-linux64.tar.gz -C /home/ubuntu/ && \ - rm /home/ubuntu/naoqi-sdk-2.5.5.5-linux64.tar.gz - -RUN echo "export PYTHONPATH=\${PYTHONPATH}:/home/ubuntu/naoqi-sdk-2.5.5.5-linux64/lib" >> ~/.bashrc && \ - echo "export PYTHONPATH=\${PYTHONPATH}:/home/ubuntu/pynaoqi-python2.7-2.5.5.5-linux64/lib/python2.7/site-packages" >> ~/.bashrc + rm /home/ubuntu/naoqi-sdk-2.5.5.5-linux64.tar.gz && \ + echo "export PYTHONPATH=\${PYTHONPATH}:/home/ubuntu/naoqi-sdk-2.5.5.5-linux64/lib" >> ~/.bashrc && \ + echo "export PYTHONPATH=\${PYTHONPATH}:/home/ubuntu/pynaoqi-python2.7-2.5.5.5-linux64/lib/python2.7/site-packages" >> ~/.bashrc && \ + echo "export NAOqi_DIR=/home/ubuntu/naoqi-sdk-2.5.5.5-linux64" >> ~/.bashrc COPY ./scripts/startup.sh /startup.sh COPY ./scripts/connectPEPPER.sh /home/ubuntu/connectPEPPER.sh COPY ./scripts/pepper.rviz /home/ubuntu/pepper.rviz COPY ./scripts/launchdemo.txt /home/ubuntu/launchdemo.txt -