浏览代码

rebase ubuntu changes

orbitzs 4 年之前
父节点
当前提交
f145afa5a8
共有 4 个文件被更改,包括 88 次插入1 次删除
  1. 1 1
      .gitignore
  2. 2 0
      ubuntu/.gitignore
  3. 5 0
      ubuntu/upuib.sh
  4. 80 0
      ubuntu/vbr_ubib.sh

+ 1 - 1
.gitignore

@@ -4,4 +4,4 @@ openvpn-as/
 #openvpn/
 syncthing/data1/
 #wireguard/
-ubuntu/
+#ubuntu/

+ 2 - 0
ubuntu/.gitignore

@@ -0,0 +1,2 @@
+mickey/
+docker-ubuntu-vnc-desktop/

+ 5 - 0
ubuntu/upuib.sh

@@ -0,0 +1,5 @@
+##
+# to create multiple containers, clone this script and change container name and ip address in the script
+#./vbr_docker_compose.sh run ovs-br1 eth2 u2 ~/docker/ubuntu 192.168.6.16 24 192.168.6.1
+./vbr_ubib.sh run ovs-br1 eth2 u5 ~/docker/ubuntu 192.168.6.17 24 192.168.6.1
+

+ 80 - 0
ubuntu/vbr_ubib.sh

@@ -0,0 +1,80 @@
+#
+#!/bin/sh
+
+find(){
+ 
+        #sudo ovs-vsctl --data=bare --no-heading --columns=name find interface external_ids:container_id=**con1** external_ids:container_iface=**eth2**
+        sudo ovs-vsctl --data=bare --columns=external_ids,name find interface 
+}
+
+run() {
+	BRIDGE=$2
+	INTERFACE=$3
+	CONTAINER=$4
+	CONTAINER_DIR=$5
+	IPADDR=$6
+	IPMASK=$7 
+        GATEWAY=$8
+	sudo ovs-vsctl show
+        echo "Delete previous assigned ports for container: $CONTAINER..."
+	sudo ovs-docker del-ports $BRIDGE $CONTAINER 
+        echo "starting container $CONTAINER..."
+	#env $(cat $CONTAINER_DIR/.env | grep "#" -v) docker-compose -f $CONTAINER_DIR/docker-compose.yml up -d
+#        docker run -d -p 6080:80 -p 5900:5900 -v /dev/shm:/dev/shm  --name $CONTAINER --cap-add=NET_ADMIN -e USER=mickey -e PASSWORD=mouse -e RESOLUTION=1920x1080 --net=none --rm dorowu/ubuntu-desktop-lxde-vnc:focal 
+        docker run -d -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro -v /dev/shm:/dev/shm -v /home/tuffy/docker/Dockers_dev/ubuntu/mickey:/home/mickey  --name $CONTAINER --device /dev/snd -e ALSADEV=hw:3,0 --cap-add=NET_ADMIN -e USER=mickey -e PASSWORD=mouse -e RESOLUTION=1920x1080 -e TZ=Asia/Hong_Kong --net=none --rm ub1:1.2
+
+	sleep 1
+        echo "assign $INTERFACE to $CONTAINER with ipaddress $IPADDR/$IPMASK..." 
+	sudo ovs-docker add-port $BRIDGE $INTERFACE $CONTAINER --ipaddress=$IPADDR/$IPMASK --gateway=$GATEWAY
+	#sudo ovs-docker add-port ovs-br1 eth2 con2 --ipaddress=192.168.6.11/24
+        docker exec -it $CONTAINER ip route add default via $GATEWAY dev $INTERFACE
+        docker exec -it $CONTAINER route 
+        sudo ovs-vsctl show
+
+
+}
+
+
+destroy(){
+	BRIDGE=$2
+	CONTAINER=$3
+
+        echo "Stopping $BRIDGE ...  $CONTAINER..."
+	docker stop $CONTAINER
+        echo "Delete previous assigned ports for container: $CONTAINER..."
+	sudo ovs-docker del-ports $BRIDGE $CONTAINER 
+	sudo ovs-vsctl show
+        
+     
+}
+
+
+usage() {
+    cat << EOF
+    
+    PARAM:
+     run 	BRIDGE INTERFACE CONTAINER CONTAINER_DIR IPADDR MASK 
+     stop       BRIDGE CONTAINER	
+EOF
+}
+
+if [ $# -eq 0 ]; then
+    usage
+    exit 0
+fi
+
+case $1 in
+    "run")
+          run "$@"
+          exit 0
+          ;;
+     "stop") 
+          destroy "$@"
+          exit 0
+          ;;
+     "find") 
+          find "$@"
+          exit 0
+          ;;
+
+esac