Browse Source

hide db port

ysyyhhh 1 year ago
parent
commit
c00d8b8fd8
6 changed files with 62 additions and 8 deletions
  1. 43 3
      FuzzScene/Dockerfile
  2. 2 2
      FuzzScene/docker-run.sh
  3. 14 0
      README-DEPLOY.md
  4. 1 1
      client
  5. 1 1
      docker-compose.yml
  6. 1 1
      server

+ 43 - 3
FuzzScene/Dockerfile

@@ -1,7 +1,5 @@
 FROM carlasim/carla:0.9.13
 
-COPY . /home/vangogh/software/FuzzScene
-
 # CMD ['/bin/sh','-c','/bin/bash']
 
 # 添加环境变量
@@ -9,4 +7,46 @@ COPY . /home/vangogh/software/FuzzScene
 # export RUNLEVEL=3
 
 ENV XDG_RUNTIME_DIR=/usr/lib/
-ENV RUNLEVEL=3
+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 apt-key del 7fa2af80
+
+
+RUN sed -i 's/archive.ubuntu.com/mirrors.tuna.tsinghua.edu.cn/g' /etc/apt/sources.list
+
+RUN apt-get update && apt-get install -y --no-install-recommends wget
+
+RUN wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb
+
+RUN dpkg -i cuda-keyring_1.0-1_all.deb
+
+# 设置清华源
+
+RUN apt-get update
+
+RUN apt-get install xdg-user-dirs
+
+RUN apt-get install nano sudo curl -y
+
+RUN apt-get install libglu1-mesa-dev freeglut3-dev mesa-common-dev mesa-utils -y
+
+RUN apt-get install libxtst6 libxv1 libegl1-mesa -y
+
+RUN wget https://sourceforge.net/projects/virtualgl/files/3.0.1/virtualgl_3.0.1_amd64.deb
+
+RUN dpkg -i virtualgl_3.0.1_amd64.deb
+
+RUN apt-get update 
+
+RUN apt-get -f install
+
+USER carla
+
+COPY . /home/vangogh/software/FuzzScene
+
+# CMD ["/home/carla/CarlaUE4.sh -opengl"]
+# CMD ["./CarlaUE4.sh","-opengl"]

+ 2 - 2
FuzzScene/docker-run.sh

@@ -2,6 +2,6 @@ docker rm -f fuzzscene
 docker rmi -f fuzzscene
 docker build -t fuzzscene .
 
-docker run -e DISPLAY=$DISPLAY -it --net=host --gpus all fuzzscene /bin/bash
-# docker run -it --privileged --name fuzzscene --gpus all -e DISPLAY=$DISPLAY --net=host  fuzzscene /bin/bash
+# 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
 

+ 14 - 0
README-DEPLOY.md

@@ -1,4 +1,18 @@
 
+## 数据库初始化
+
+### mysql账号初始化
+
+```shell
+create database test;
+CREATE USER 'test'@'%' IDENTIFIED BY 'test';
+grant all privileges on test.* to 'test'@'%';
+use test;
+source mysql/springboot.sql;
+```
+
+### 表初始化
+
 ## docker-compose 启动
 
 ## k8s 启动

+ 1 - 1
client

@@ -1 +1 @@
-Subproject commit 551dbf88ad29a56fb58331a4a7047630d3814775
+Subproject commit 5d72b74d4e31d3cefbf03e28681e452928b5c13b

+ 1 - 1
docker-compose.yml

@@ -27,7 +27,7 @@ services:
     image: mysql:5.7
     # restart: always
     ports:
-      - 3306:3306
+      - 3306
     volumes:
       - ./mysql/data:/var/lib/mysql
     environment:

+ 1 - 1
server

@@ -1 +1 @@
-Subproject commit 4103fd5bdbf9459bef52abf487f71341ee8560ba
+Subproject commit 808af53440d50ebfd2c7e26102b837bec68f10cb