autodl seetaas增加 修改cuda-10.2-base-ubuntu dockerfile配置

script/autodl/2-replace-file.sh

@@ -42,8 +42,11 @@ sudo sed -i s#autodl_backend#$autodl_backend#g `find $workspace -type f -name pr
 sudo sed -i s#autodl_back_socket#$autodl_back_socket#g `find $workspace -type f -name production-base.js`
 sudo sed -i s#autodl_file#$autodl_file#g `find $workspace -type f -name production-base.js`
 sudo sed -i s#autodl_admin_backend#$autodl_admin_backend#g `find $workspace -type f -name production-base.js`
+
+
 ##################################修改Dockerfile#######################################################
 sed -i s#autodl/ubuntu-basic:16.04#$harbor_host/k8s/ubuntu-basic:16.04#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`
 sed -i s#autodl/image-proxy:v0.9.0#$harbor_host/k8s/image-proxy:v0.9.0#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`
 sed -i s#FROM\ nginx#FROM\ $harbor_host/k8s/nginx#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`
+sed -i s#nvidia/cuda:10.0-base-ubuntu16.04#$harbor_host/k8s/cuda:10.0-base-ubuntu16.04#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`
 

script/k8s/deploy-gpu-k8s.sh

@@ -183,6 +183,8 @@ cp /root/k8s/service/flanneld.service /lib/systemd/system/
 ansible master -m copy -a "src=/lib/systemd/system/flanneld.service dest=/lib/systemd/system/ mode=755"
 ansible master -m shell -a "systemctl daemon-reload && service flanneld restart && service flanneld status &&  systemctl enable flanneld.service"
 ansible master -m copy -a "src=/root/k8s/service/docker.service dest=/lib/systemd/system/docker.service mode=755" 
+####################################安装nvidia-docker2#####################################
+apt install nvidia-docker2 --allow-insecure-repositories
 ###############################安装docker###############################################
 echo "当前harbor仓库地址为$harbor_host,"
 sed -i s/harbor_host/$harbor_host/g /root/k8s/config/daemon.json_gpu 
@@ -190,14 +192,12 @@ echo "开始安装docker"
 ansible master -m shell -a "apt update --allow-insecure-repositories"
 ansible master -m shell -a "apt install docker-ce  -y --allow-unauthenticated"
 echo "分发已修改的daemon.json文件"
-ansible master -m copy -a "src=/root/k8s/config/daemon.json_gpu dest=/etc/docker/"
+ansible master -m copy -a "src=/root/k8s/config/daemon.json_gpu dest=/etc/docker/daemon.json"
 ansible master -m shell -a "service docker restart"
 ansible master -m shell -a "service docker status"
 ansible master -m shell -a "cat /etc/docker/daemon.json"
 echo "还原daemon.json模板文件"
 sed -i s/$harbor_host/harbor_host/g /root/k8s/config/daemon.json_gpu
-####################################安装nvidia-docker2#####################################
-ansible master -m shell -a "apt install nvidia-docker2 --allow-insecure-repositories"
 ###############################安装master节点###############################################
 cat >>kubernetes-csr.json<<EOF
 {
@@ -286,9 +286,6 @@ kubectl config set-context kubernetes --cluster=kubernetes --user=admin
 kubectl config use-context kubernetes
 ansible master -m shell -a "systemctl enable kube-apiserver.service && systemctl enable kube-controller-manager.service && systemctl enable kube-scheduler.service"
 ansible master -m shell -a  "cp /opt/kubernetes/bin/kubectl /usr/bin/"
-#echo "设置命令自动补全"
-#source <(kubectl completion bash)
-#echo "source <(kubectl completion bash)" >> ~/.bashrc
 ##############################################安装master 的node节点###################################
 ansible master -m copy -a "src=/root/k8s/bin/kube-proxy dest=/opt/kubernetes/bin/ mode=777"
 ansible master -m copy -a "src=/root/k8s/bin/kubelet dest=/opt/kubernetes/bin/ mode=777"
@@ -361,7 +358,6 @@ KUBE_PROXY_OPTS="--logtostderr=false \
 EOF
 scp /opt/kubernetes/cfg/kube-proxy.$node_ip $node_ip:/opt/kubernetes/cfg/kube-proxy
 done
-kubectl create -f /root/k8s/config/auto-cert.yaml 
 ansible master -m copy -a "src=/root/k8s/ssl/kube-proxy.pem dest=/opt/kubernetes/ssl/"
 ansible master -m copy -a "src=/root/k8s/ssl/kube-proxy-key.pem dest=/opt/kubernetes/ssl/"
 

script/seetaas/2-replace-file.sh

@@ -46,8 +46,9 @@ sudo sed -i s#mobile_frontend#$mobile_frontend#g `find $workspace -type f -name
 sudo sed -i s/harbor_host/$harbor_host/g `find $workspace -maxdepth 3  -type f -name Makefile`
 cp ~/.docker/config.json $workspace/src/autodl-core/conf/ #用于生产环境以及私有部署autodl-core服务向镜像仓库推送镜像所添加的认证文件。
 cp ~/.docker/config.json $workspace/src/seetaas-backend/conf/ #用于生产环境以及私有部署autodl-core服务向镜像仓库推送镜像所添加的认证文件。
+
 ##################################修改Dockerfile#######################################################
 sed -i s#autodl/ubuntu-basic:16.04#$harbor_host/k8s/ubuntu-basic:16.04#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`
 sed -i s#autodl/image-proxy:v0.9.0#$harbor_host/k8s/image-proxy:v0.9.0#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`
 sed -i s#FROM\ nginx#FROM\ $harbor_host/k8s/nginx#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`
-
+sed -i s#nvidia/cuda:10.0-base-ubuntu16.04#$harbor_host/k8s/cuda:10.0-base-ubuntu16.04#g `find $workspace  -maxdepth 5 -name Dockerfile -type f`