Explorar el Código

视频中的部分完成

ysyyhhh hace 1 año
padre
commit
2d86206a05
Se han modificado 6 ficheros con 31 adiciones y 8 borrados
  1. 18 3
      FuzzScene/Dockerfile
  2. 3 3
      FuzzScene/Dockerfile cuda
  3. 3 1
      FuzzScene/docker-run.sh
  4. 4 0
      README-DEPLOY.md
  5. 1 1
      client
  6. 2 0
      docker-compose.yml

+ 18 - 3
FuzzScene/Dockerfile

@@ -1,5 +1,5 @@
-# FROM carlasim/carla:0.9.13
-FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04
+FROM carlasim/carla:0.9.13
+
 # CMD ['/bin/sh','-c','/bin/bash']
 
 # 添加环境变量
@@ -11,7 +11,7 @@ ENV RUNLEVEL=3
 USER root
 RUN rm /etc/apt/sources.list.d/cuda.list
 
-# RUN rm /etc/apt/sources.list.d/nvidia-ml.list
+RUN rm /etc/apt/sources.list.d/nvidia-ml.list
 
 RUN apt-key del 7fa2af80
 
@@ -65,6 +65,21 @@ COPY requirements.txt requirements.txt
 
 RUN pip install -r requirements.txt
 
+
+# RUN wget http://download.nvidia.com/XFree86/Linux-x86_64/450.57/NVIDIA-Linux-x86_64-450.57.run
+
+# RUN sudo /bin/bash NVIDIA-Linux-x86_64-450.57.run --accept-license --no-questions --ui=none
+
+# RUN sudo apt-get install -y xserver-xorg mesa-utils libvulkan1
+
+# RUN sudo nvidia-xconfig --preserve-busid -a --virtual=1280x1024
+
+# RUN ENV SDL_VIDEODRIVER=x11
+
+# RUN sudo X :0 &
+
+RUN apt install vulkan-utils
+
 USER carla
 
 # WORKDIR /home/vangogh/software/FuzzScene

+ 3 - 3
FuzzScene/Dockerfile copy → FuzzScene/Dockerfile cuda

@@ -1,5 +1,5 @@
-FROM carlasim/carla:0.9.13
-
+# FROM carlasim/carla:0.9.13
+FROM nvidia/cuda:11.2.2-cudnn8-devel-ubuntu20.04
 # CMD ['/bin/sh','-c','/bin/bash']
 
 # 添加环境变量
@@ -11,7 +11,7 @@ ENV RUNLEVEL=3
 USER root
 RUN rm /etc/apt/sources.list.d/cuda.list
 
-RUN rm /etc/apt/sources.list.d/nvidia-ml.list
+# RUN rm /etc/apt/sources.list.d/nvidia-ml.list
 
 RUN apt-key del 7fa2af80
 

+ 3 - 1
FuzzScene/docker-run.sh

@@ -3,5 +3,7 @@ docker rmi -f fuzzscene
 docker build -t fuzzscene .
 
 # docker run -e DISPLAY=$DISPLAY -d --net=host --gpus all fuzzscene
-docker run -it --privileged --name fuzzscene --gpus all -e DISPLAY=$DISPLAY --net=host  fuzzscene /bin/bash
+docker run -it --privileged --name fuzzscene --gpus all -e DISPLAY=host.docker.internal:0.0 --net=host  fuzzscene /bin/bash
 
+
+docker run --privileged --gpus all --net=host -e DISPLAY=host.docker.internal:0.0 carlasim/carla:0.9.13 /bin/bash ./CarlaUE4.sh

+ 4 - 0
README-DEPLOY.md

@@ -1,3 +1,7 @@
+## 使用手册
+
+创建种子时,要查看种子内的地图编号,使得地图编号和种子文件的地图编号一致
+
 ## 项目部署
 
 ```shell

+ 1 - 1
client

@@ -1 +1 @@
-Subproject commit e4c376f835d1f97e320fc6d88744b4f5c22dc811
+Subproject commit 0ebd964c09a9a063e353897ed4ed48d503fbbdf4

+ 2 - 0
docker-compose.yml

@@ -21,6 +21,8 @@ services:
       - MYSQL_URL=jdbc:mysql://db:3306/test?serverTimezone=Asia/Shanghai
       - MYSQL_USERNAME=test
       - MYSQL_PASSWORD=test
+    volumes:
+      - ./server/static:/app/static
     depends_on:
       - db
     networks: