Merge pull request #547 from DeveloperJim/1.18.x

1.18.3 DNS编译
TencentBlueKing · Aug 5, 2020 · 188ed05 · 188ed05
2 parents ddce7e6 + 82bb294
commit 188ed05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -92,17 +92,13 @@ client:pre
 	cp -R ./install/conf/bcs-services/bcs-client ${PACKAGEPATH}/bcs-services
 	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-services/bcs-client/bcs-client ./bcs-services/bcs-client/cmd/main.go
 
-dns:pre
+dns:
 	mkdir -p ${PACKAGEPATH}/bcs-services
 	mkdir -p ${PACKAGEPATH}/bcs-mesos-master
 	cp -R ./install/conf/bcs-mesos-master/bcs-dns ${PACKAGEPATH}/bcs-mesos-master
 	cp -R ./install/conf/bcs-services/bcs-dns-service ${PACKAGEPATH}/bcs-services
-	mkdir -p vendor/github.com/coredns/coredns/
-	cp -r ${GOPATH}/pkg/mod/github.com/coredns/coredns\@v1.3.0/* vendor/github.com/coredns/coredns/
-	cp bcs-services/bcs-dns/plugin.cfg vendor/github.com/coredns/coredns/
-	cd vendor/github.com/coredns/coredns && make gen && cd -
-	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-services/bcs-dns-service/bcs-dns-service bk-bcs/vendor/github.com/coredns/coredns
-	go build ${LDFLAG} -o ${PACKAGEPATH}/bcs-mesos-master/bcs-dns/bcs-dns bk-bcs/vendor/github.com/coredns/coredns
+	cd ../coredns && go build ${LDFLAG} -o ${WORKSPACE}/${PACKAGEPATH}/bcs-services/bcs-dns-service/bcs-dns-service coredns.go
+	cd ../coredns && go build ${LDFLAG} -o ${WORKSPACE}/${PACKAGEPATH}/bcs-mesos-master/bcs-dns/bcs-dns coredns.go
 
 health:pre
 	mkdir -p ${PACKAGEPATH}/bcs-services

diff --git a/install/conf/bcs-services/bcs-dns-service/container-start.sh b/install/conf/bcs-services/bcs-dns-service/container-start.sh
@@ -7,7 +7,7 @@ chmod +x ${module}
 
 #check configuration render
 if [ $BCS_CONFIG_TYPE == "render" ]; then
-  cat ${module}.config.template | envsubst | tee ${module}.json
+  cat ${module}.config.template | envsubst | tee ${module}.config
 fi
 
 #ready to start