diff --git a/.gitignore b/.gitignore index d5426a5..23c41bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -source_me.sh *.deb +*.gz diff --git a/.server.sh.swp b/.server.sh.swp new file mode 100644 index 0000000..571621c --- /dev/null +++ b/.server.sh.swp Binary files differ diff --git a/Dockerfile b/Dockerfile index 5c14cb4..75807c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -205,7 +205,7 @@ cd /opt/carla-simulator && \ apt-get update && apt-get install -y --no-install-recommends \ carla-simulator=0.9.10-1 \ - libxerces-c-dev python-dev python3-dev && \ + libxerces-c-dev python-dev python3-dev iproute2 && \ rm -rf /var/lib/apt/lists/* && \ echo "export PYTHONPATH=$PYTHONPATH:/opt/carla-simulator/PythonAPI/carla/dist/carla-0.9.10-py2.7-linux-x86_64.egg:/opt/carla-simulation/PythonAPI/carla" >> ~/.bashrc && \ pip install --upgrade setuptools && \ @@ -228,6 +228,13 @@ markdown-include \ mkdocs-redirects \ networkx + +COPY AdditionalMaps_0.9.10.1.tar.gz /home/$USERNAME/ +RUN tar xfvz /home/$USERNAME/AdditionalMaps_0.9.10.1.tar.gz -C /opt/carla-simulator/ && \ + rm /home/$USERNAME/AdditionalMaps_0.9.10.1.tar.gz && \ + mkdir -p /home/$USERNAME/.config && \ + chmod -R 777 /home/$USERNAME/.config + COPY run.sh /run.sh CMD ["bash", "/run.sh"] diff --git a/server.sh b/server.sh index 021e832..d393e0e 100755 --- a/server.sh +++ b/server.sh @@ -2,12 +2,23 @@ if [ ! -e ./cuda-repo-ubuntu1804-11-2-local_11.2.2-460.32.03-1_amd64.deb ]; then wget https://developer.download.nvidia.com/compute/cuda/11.2.2/local_installers/cuda-repo-ubuntu1804-11-2-local_11.2.2-460.32.03-1_amd64.deb fi +if [ ! -e ./AdditionalMaps_0.9.10.1.tar.gz ]; then + wget https://carla-releases.s3.eu-west-3.amazonaws.com/Linux/AdditionalMaps_0.9.10.1.tar.gz +fi docker build -t sim . && \ # docker run --device=/dev/tty0:rw -it --rm --gpus all \ docker run --privileged -it --rm --gpus all \ -p 6080:8081 \ -e RESOLUTION=1920x1080 \ + -v /dev/shm:/dev/shm \ + -p 2000-2002:2000-2002 \ + -e NVIDIA_VISIBLE_DEVICES=all \ + -e NVIDIA_DRIVER_CAPABILITIES=all \ + -e DISPLAY=172.17.0.2:0.0 \ + --shm-size=1gb \ + --env=QT_X11_NO_MITSHM=1 \ + --net bridge \ -e VNCPASS=pass \ --name sim sim # -v $HOME/hoge:/hoge:ro \