move sshd start to dockerfile

.dockerignore

@@ -3,4 +3,6 @@ output
 docs
 build
 .vscode
-artifacts
+artifacts
+bin
+node_modules

bin/build

@@ -3,7 +3,6 @@ TAG=$(echo $TRAVIS_BRANCH | sed "s/\//-/")
 TAG=${TAG:-latest}
 docker build -t registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect -f docker/kt-connect/Dockerfile .
 
-#docker build -t registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:$TAG -f docker/shadow/Dockerfile .
-docker build --cache-from registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:latest -t registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:$TAG -f docker/shadow/Dockerfile .
+docker build -t registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-shadow:$TAG -f docker/shadow/Dockerfile .
 docker build -t registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-dashboard:$TAG -f docker/dashboard/Dockerfile .
 docker build -t registry.cn-hangzhou.aliyuncs.com/rdc-incubator/kt-connect-server:$TAG -f docker/apiserver/Dockerfile .

docker/shadow/Dockerfile

@@ -6,4 +6,7 @@ RUN GOARCH=amd64 GOOS=linux go build -o bin/kt-shadow cmd/proxy/main.go
 
 FROM registry.cn-hangzhou.aliyuncs.com/rdc-incubator/shadow-base
 COPY --from=0 /go/src/github.com/alibaba/kt-connect/bin/kt-shadow /usr/sbin/kt-shadow
-CMD ["/usr/sbin/kt-shadow"]
+ADD docker/shadow/run.sh /run.sh
+RUN chmod 755 /run.sh
+
+CMD ["/run.sh"]

docker/shadow/run.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+/usr/sbin/sshd -D &
+/usr/sbin/kt-shadow

pkg/proxy/daemon/dnsserver.go

@@ -2,7 +2,6 @@ package daemon
 
 import (
 	"errors"
-	"fmt"
 	"net"
 	"os"
 	"strconv"
@@ -13,36 +12,30 @@ import (
 	"github.com/miekg/dns"
 )
 
-// DNSRequestHandler
-type DNSRequestHandler struct{}
+// dns server
+type server struct{}
 
-// ServeDNS start dns server
-func ServeDNS() (err error) {
-	srv := &dns.Server{Addr: ":" + strconv.Itoa(53), Net: "udp"}
-	srv.Handler = &DNSRequestHandler{}
+// NewDNSServerDefault create default dns server
+func NewDNSServerDefault() (srv *dns.Server) {
+	srv = &dns.Server{Addr: ":" + strconv.Itoa(53), Net: "udp"}
+	srv.Handler = &server{}
 
 	config, _ := dns.ClientConfigFromFile("/etc/resolv.conf")
 
 	log.Info().Msgf("Successful load local /etc/resolv.conf")
 	for _, server := range config.Servers {
 		log.Info().Msgf("Success load nameserver %s\n", server)
 	}
-
-	fmt.Printf("DNS Server Start At 53...\n")
-	err = srv.ListenAndServe()
-	if err != nil {
-		log.Error().Msgf("Failed to set udp listener %s\n", err.Error())
-	}
 	return
 }
 
 //ServeDNS query DNS rescord
-func (h *DNSRequestHandler) ServeDNS(w dns.ResponseWriter, r *dns.Msg) {
+func (h *server) ServeDNS(w dns.ResponseWriter, req *dns.Msg) {
 	msg := dns.Msg{}
-	msg.SetReply(r)
+	msg.SetReply(req)
 	msg.Authoritative = true
 	// Stuff must be in the answer section
-	for _, a := range query(w, r) {
+	for _, a := range query(w, req) {
 		log.Info().Msgf("%v\n", a)
 		msg.Answer = append(msg.Answer, a)
 	}

pkg/proxy/server/server.go

@@ -1,20 +1,20 @@
 package server
 
 import (
+	"fmt"
+
 	"github.com/alibaba/kt-connect/pkg/proxy/daemon"
 	"github.com/rs/zerolog/log"
 )
 
 // Run start kt proxy
 func Run() (err error) {
 	log.Info().Msg("Start kt connect proxy")
-	err = daemon.ServerSSH()
-	if err != nil {
-		return
-	}
-	err = daemon.ServeDNS()
+	srv := daemon.NewDNSServerDefault()
+	err = srv.ListenAndServe()
 	if err != nil {
 		return
 	}
+	fmt.Printf("DNS Server Start At 53...\n")
 	return
 }