diff --git a/Dockerfile b/Dockerfile index 852ae8d..491f957 100644 --- a/Dockerfile +++ b/Dockerfile @@ -198,7 +198,20 @@ 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 + echo "export NAOqi_DIR=/home/ubuntu/naoqi-sdk-2.5.5.5-linux64" >> ~/.bashrc && \ + . /home/ubuntu/.bashrc +# cd /home/ubuntu/catkin_ws/src && \ +# git clone https://github.com/ros-naoqi/pepper_meshes.git && \ +# cd pepper_meshes && \ +# cmake . && \ +# cd /home/ubuntu/catkin_ws && \ +# catkin build && \ +# apt-get update && \ +# yes yes | apt-get install --no-install-recommends ros-kinetic-pepper-meshes + +#RUN apt-get update && \ +# apt-get upgrade -y && \ +# yes | apt-get install --no-install-recommends ros-kinetic-pepper-meshes COPY ./scripts/startup.sh /startup.sh COPY ./scripts/connectPEPPER.sh /home/ubuntu/connectPEPPER.sh diff --git a/buildPEPPER.sh b/buildPEPPER.sh index 5c6b398..c78b52e 100755 --- a/buildPEPPER.sh +++ b/buildPEPPER.sh @@ -4,4 +4,4 @@ if [ ! -e ./scripts/naoqi-sdk-2.5.5.5-linux64.tar.gz ]; then wget -P ./scripts https://community-static.aldebaran.com/resources/2.5.5/naoqi-sdk/naoqi-sdk-2.5.5.5-linux64.tar.gz fi -docker build -t pepper . +docker build --rm -t pepper . diff --git a/scripts/startup.sh b/scripts/startup.sh index 8eb5e9f..6502fbc 100755 --- a/scripts/startup.sh +++ b/scripts/startup.sh @@ -68,5 +68,7 @@ # clearup PASSWORD= HTTP_PASSWORD= -echo "Please execute -> sudo apt install ros-kinetic-peper-meshes" +echo "Please execute " +echo "sudo apt update" +echo "sudo apt install ros-kinetic-pepper-meshes" exec /bin/tini -- /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf