diff --git a/Dockerfile b/Dockerfile index e3cebfe..0fdb2a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -153,10 +153,10 @@ # novnc # download websockify as well -RUN wget https://github.com/novnc/noVNC/archive/v1.2.0.zip && \ - unzip -q v1.2.0.zip && \ - rm -rf v1.2.0.zip && \ - git clone -b v0.9.0 https://github.com/novnc/websockify /noVNC-1.2.0/utils/websockify +RUN wget https://github.com/novnc/noVNC/archive/v1.3.0.zip && \ + unzip -q v1.3.0.zip && \ + rm -rf v1.3.0.zip && \ + git clone -b v0.10.0 https://github.com/novnc/websockify /noVNC-1.3.0/utils/websockify # Xorg segfault error @@ -237,7 +237,7 @@ catkin_init_workspace ~/catkin_ws/src && \ cd ~/catkin_ws/src && \ git clone --recursive https://github.com/carla-simulator/ros-bridge.git -b 0.9.11 && \ - echo "0.9.13" > /home/kbkn/catkin_ws/src/ros-bridge/carla_ros_bridge/src/carla_ros_bridge/CARLA_VERSION && \ + echo ${CARLA_VERSION} > /home/kbkn/catkin_ws/src/ros-bridge/carla_ros_bridge/src/carla_ros_bridge/CARLA_VERSION && \ cd ~/catkin_ws && \ catkin_make -DCMAKE_BUILD_TYPE=Release && \ source ~/catkin_ws/devel/setup.bash @@ -250,9 +250,9 @@ echo "alias cm='cd ~/catkin_ws;catkin_make'" >> ~/.bashrc && \ echo "alias cs='cd ~/catkin_ws/src'" >> ~/.bashrc && \ echo "export SCENARIO_RUNNER_PATH=/home/$USERNAME/scenario_runner" >> ~/.bashrc && \ - pip install -r /home/kbkn/CARLA_0.9.13/PythonAPI/util/requirements.txt && \ - pip install -r /home/kbkn/CARLA_0.9.13/PythonAPI/carla/requirements.txt && \ -pip install -r /home/kbkn/scenario_runner/requirements.txt + pip install -r /home/kbkn/CARLA_${CARLA_VERSION}/PythonAPI/util/requirements.txt && \ + pip install -r /home/kbkn/CARLA_${CARLA_VERSION}/PythonAPI/carla/requirements.txt && \ + pip install -r /home/kbkn/scenario_runner/requirements.txt USER root WORKDIR /root diff --git a/startup.sh b/startup.sh index 79259f9..61689c6 100755 --- a/startup.sh +++ b/startup.sh @@ -22,7 +22,7 @@ # sleep 2 # 3. start noVNC -/noVNC-1.2.0/utils/launch.sh --vnc 172.17.0.2:5900 --listen 8081 & +/noVNC-1.3.0/utils/novnc_proxy --vnc 172.17.0.2:5900 --listen 8081 & sleep 2 echo 'running noVNC at http://docker_ip:6080/vnc_lite.html'