diff --git a/Dockerfile b/Dockerfile index f2e48ec..ba8b45b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,9 @@ LABEL maintainer="ikko@hosei.ac.jp" -ARG CARLA_VERSION_FULL=0.9.13 -ARG CARLA_VERSION=0.9.13 +ARG CARLA_VERSION_FULL=0.9.14 +ARG CARLA_VERSION=0.9.14 +ARG CARLA_VERSION0=0.9.13 ENV NVIDIA_VISIBLE_DEVICES=all ENV NVIDIA_DRIVER_CAPABILITIES=compute,graphics,display ENV DEBIAN_FRONTEND noninteractive @@ -256,7 +257,7 @@ source ~/catkin_ws/devel/setup.bash RUN cd /home/$USERNAME && \ - git clone https://github.com/carla-simulator/scenario_runner.git -b v${CARLA_VERSION} + git clone https://github.com/carla-simulator/scenario_runner.git -b v${CARLA_VERSION0} RUN echo "source /opt/ros/melodic/setup.bash" >> ~/.bashrc && \ echo "source ~/catkin_ws/devel/setup.bash" >> ~/.bashrc && \ diff --git a/build.sh b/build.sh index d089d92..a271cd1 100755 --- a/build.sh +++ b/build.sh @@ -1,9 +1,9 @@ #!/bin/bash -#if [ ! -e ./AdditionalMaps_0.9.13.tar.gz ]; then -# wget https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/AdditionalMaps_0.9.13.tar.gz +#if [ ! -e ./AdditionalMaps_0.9.14.tar.gz ]; then +# wget https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/AdditionalMaps_0.9.14.tar.gz #fi -if [ ! -e ./CARLA_0.9.13.tar.gz ]; then - wget https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/CARLA_0.9.13.tar.gz +if [ ! -e ./CARLA_0.9.14.tar.gz ]; then + wget https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/CARLA_0.9.14.tar.gz fi -docker build -t carla0913a . +docker build -t carla0914a . diff --git a/run.sh b/run.sh index bf17a84..243efde 100755 --- a/run.sh +++ b/run.sh @@ -15,4 +15,4 @@ -e RESOLUTION=1920x1080 \ --shm-size=8gb \ --net bridge \ - --name carla0913a carla0913a + --name carla0914a carla0914a diff --git a/scripts/setcarla.sh b/scripts/setcarla.sh index 1ddc86d..7f8b514 100755 --- a/scripts/setcarla.sh +++ b/scripts/setcarla.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town03 diff --git a/scripts/setcarla01.sh b/scripts/setcarla01.sh index de574fe..d256226 100755 --- a/scripts/setcarla01.sh +++ b/scripts/setcarla01.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town01 diff --git a/scripts/setcarla02.sh b/scripts/setcarla02.sh index bbaa7ba..c95084b 100755 --- a/scripts/setcarla02.sh +++ b/scripts/setcarla02.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town02 diff --git a/scripts/setcarla04.sh b/scripts/setcarla04.sh index 95067da..540bcb9 100755 --- a/scripts/setcarla04.sh +++ b/scripts/setcarla04.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town04 diff --git a/scripts/setcarla05.sh b/scripts/setcarla05.sh index 46949df..6c15641 100755 --- a/scripts/setcarla05.sh +++ b/scripts/setcarla05.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town05 diff --git a/scripts/setcarla06.sh b/scripts/setcarla06.sh index 83fdb7b..acbe416 100755 --- a/scripts/setcarla06.sh +++ b/scripts/setcarla06.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town06 diff --git a/scripts/setcarla07.sh b/scripts/setcarla07.sh index 4afb1d6..7649342 100755 --- a/scripts/setcarla07.sh +++ b/scripts/setcarla07.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town07 diff --git a/scripts/setcarla10.sh b/scripts/setcarla10.sh index f956179..bcb993c 100755 --- a/scripts/setcarla10.sh +++ b/scripts/setcarla10.sh @@ -1,2 +1,2 @@ -cd /home/$USERNAME/CARLA_0.9.13/PythonAPI +cd /home/$USERNAME/CARLA_0.9.14/PythonAPI python util/config.py -m Town10HD diff --git a/scripts/startcarla.sh b/scripts/startcarla.sh index 12082e1..6e734dd 100755 --- a/scripts/startcarla.sh +++ b/scripts/startcarla.sh @@ -1,4 +1,4 @@ -cd /home/$USERNAME/CARLA_0.9.13 +cd /home/$USERNAME/CARLA_0.9.14 #./CarlaUE4.sh -opengl -quality-level=Low -windowed -ResX=160 -ResY=120 ./CarlaUE4.sh -windowed -ResX=160 -ResY=120 #SDL_VIDEODRIVER=offscreen ./CarlaUE4.sh -opengl -quality-level=Low