From 3d522b013c8b10f22f900657506a6223f1afb666 Mon Sep 17 00:00:00 2001
From: ICKelin <yingjiu.hulu@gmail.com>
Date: Fri, 23 Apr 2021 19:05:44 +0800
Subject: [PATCH] ci: add docker files

---
 build.sh                         | 12 ------------
 build_exec.sh                    | 17 +++++++++++++++++
 build_image.sh                   |  6 ++++++
 docker-build/Dockerfile          |  5 +++++
 docker-build/docker-compose.yaml | 13 +++++++++++++
 docker-build/start.sh            |  3 +++
 etc/opennotr.yaml                |  4 +++-
 opennotrd/udpproxy.go            |  1 +
 opennotrd/upstream.go            |  2 +-
 run_image.sh                     |  0
 10 files changed, 49 insertions(+), 14 deletions(-)
 delete mode 100755 build.sh
 create mode 100644 build_exec.sh
 create mode 100644 build_image.sh
 create mode 100644 docker-build/Dockerfile
 create mode 100644 docker-build/docker-compose.yaml
 create mode 100644 docker-build/start.sh
 create mode 100644 run_image.sh

diff --git a/build.sh b/build.sh
deleted file mode 100755
index 581c853..0000000
--- a/build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-WORKSPACE=`pwd`
-BIN=$WORKSPACE/bin/
-
-cd $WORKSPACE/opennotr
-GOOS=darwin go build -o $BIN/opennotr-client_darwin_amd64
-GOOS=linux go build -o $BIN/opennotr-client_linux_amd64
-GOARCH=arm GOOS=linux go build -o $BIN/opennotr-client_arm
-GOARCH=arm64 GOOS=linux go build -o $BIN/opennotr-client_arm64
-
-cd $WORKSPACE/opennotrd
-GOOS=linux go build -o $BIN/opennotr-server_linux
diff --git a/build_exec.sh b/build_exec.sh
new file mode 100644
index 0000000..50d1af4
--- /dev/null
+++ b/build_exec.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+WORKSPACE=`pwd`
+BIN=$WORKSPACE/bin/
+EXEC_PREFIX=opennotrd
+
+cd $WORKSPACE/opennotr
+export GO111MODULE = on
+
+echo 'building client...'
+GOOS=darwin go build -o $BIN/$EXEC_PREFIX-client_darwin_amd64
+GOOS=linux go build -o $BIN/$EXEC_PREFIX-client_linux_amd64
+GOARCH=arm GOOS=linux go build -o $BIN/$EXEC_PREFIX-client_arm
+GOARCH=arm64 GOOS=linux go build -o $BIN/$EXEC_PREFIX-client_arm64
+
+echo 'building server...'
+cd $WORKSPACE/opennotrd
+GOOS=linux go build -o $BIN/$EXEC_PREFIX-server_linux_amd64
diff --git a/build_image.sh b/build_image.sh
new file mode 100644
index 0000000..78c354a
--- /dev/null
+++ b/build_image.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+WORKSPACE=`pwd`
+cd opennotrd && go build -o ../docker-build/opennotrd 
+
+cd $WORKSPACE/docker-build
+docker build . -t opennotr
diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
new file mode 100644
index 0000000..17f6d3f
--- /dev/null
+++ b/docker-build/Dockerfile
@@ -0,0 +1,5 @@
+FROM ickelin/resty-upstream:latest
+COPY opennotrd /opt/
+COPY start.sh /opt/ 
+RUN chmod +x /opt/start.sh && chmod +x /opt/opennotrd
+CMD /opt/start.sh
diff --git a/docker-build/docker-compose.yaml b/docker-build/docker-compose.yaml
new file mode 100644
index 0000000..1a2c155
--- /dev/null
+++ b/docker-build/docker-compose.yaml
@@ -0,0 +1,13 @@
+version: '3'
+services:     
+  opennotrd:
+    image: ickelin/opennotr:latest
+    network_mode: host
+    container_name: opennotrd
+    restart: always
+    privileged: true
+    volumes:
+      - /opt/logs/opennotr:/opt/resty-upstream/logs
+      - /opt/data/opennotrd:/opt/conf
+    environment:
+      TIME_ZONE: Asia/Shanghai
diff --git a/docker-build/start.sh b/docker-build/start.sh
new file mode 100644
index 0000000..c31adcd
--- /dev/null
+++ b/docker-build/start.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+/opt/openresty/bin/openresty -p /opt/resty-upstream -c /opt/conf/nginx-conf/nginx.conf
+/opt/opennotrd -conf /opt/conf/notrd.yaml
diff --git a/etc/opennotr.yaml b/etc/opennotr.yaml
index c44a8c3..d9705da 100644
--- a/etc/opennotr.yaml
+++ b/etc/opennotr.yaml
@@ -5,4 +5,6 @@ http: 8080
 https: 8080
 grpc: 50052
 tcp:
-  2222: 22
\ No newline at end of file
+  2222: 22
+udp:
+  53: 53
\ No newline at end of file
diff --git a/opennotrd/udpproxy.go b/opennotrd/udpproxy.go
index 21f5034..61099ed 100644
--- a/opennotrd/udpproxy.go
+++ b/opennotrd/udpproxy.go
@@ -150,6 +150,7 @@ func (p *UDPProxy) udpCopy(src, dst *net.UDPConn, toaddr *net.UDPAddr) {
 			logs.Error("read from udp fail: %v", err)
 			break
 		}
+
 		logs.Debug("write back to client %d bytes", nr)
 		_, err = dst.WriteToUDP(buf[:nr], toaddr)
 		if err != nil {
diff --git a/opennotrd/upstream.go b/opennotrd/upstream.go
index 769a933..588a106 100644
--- a/opennotrd/upstream.go
+++ b/opennotrd/upstream.go
@@ -74,7 +74,7 @@ func (p *UpstreamManager) DelUpstream(host string, httpPort, httpsPort, grpcPort
 	}
 
 	if grpcPort != 0 {
-		p.sendDeleteReq(host, "http2")
+		p.sendDeleteReq(host, "h2c")
 	}
 }
 
diff --git a/run_image.sh b/run_image.sh
new file mode 100644
index 0000000..e69de29