Merge pull request #51 from MegaByte875/suppport_certs_env

get certs from env

Author: kqzh

Dockerfile

@@ -1,17 +1,9 @@
 FROM ubuntu:20.04
 
-ENV LOGROTATE_ROTATE=5 \
-    LOGROTATE_SIZE=100M \
-    TZ=Asia/Shanghai
-
 RUN mkdir -p /usr/local/nebula/bin \
     && mkdir -p /usr/local/certs
-RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime \
-    && echo $TZ > /etc/timezone
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates curl cron logrotate \
+    && apt-get install -y --no-install-recommends ca-certificates curl \
     && apt-get clean all
 COPY bin/agent /usr/local/bin/agent
-COPY db_playback /usr/local/nebula/bin/db_playback
-COPY logrotate.sh /logrotate.sh
-RUN echo "0  *    * * *   root    /etc/cron.daily/logrotate" >> /etc/crontab
+COPY db_playback /usr/local/nebula/bin/db_playback

cmd/agent.go

@@ -4,6 +4,7 @@ import (
 	"crypto/tls"
 	"flag"
 	"net"
+	"os"
 
 	log "github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
@@ -16,6 +17,12 @@ import (
 	pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
 )
 
+const (
+	CACertPathEnv     = "CA_CERT_PATH"
+	ClientCertPathEnv = "CLIENT_CERT_PATH"
+	ClientKeyPathEnv  = "CLIENT_KEY_PATH"
+)
+
 var (
 	GitInfoSHA string
 )
@@ -47,6 +54,14 @@ func main() {
 	// set agent rate limit
 	limiter.Rate.SetLimiter(*ratelimit)
 
+	if os.Getenv(CACertPathEnv) != "" &&
+		os.Getenv(ClientCertPathEnv) != "" &&
+		os.Getenv(ClientKeyPathEnv) != "" {
+		caPath = stringPtr(os.Getenv(CACertPathEnv))
+		certPath = stringPtr(os.Getenv(ClientCertPathEnv))
+		keyPath = stringPtr(os.Getenv(ClientKeyPathEnv))
+	}
+
 	// set db_playback tls config
 	clients.InitPlayBackTLSConfig(*caPath, *certPath, *keyPath, *enableSSL)
 
@@ -93,3 +108,7 @@ func main() {
 	pb.RegisterStorageServiceServer(grpcServer, server.NewStorage())
 	grpcServer.Serve(lis)
 }
+
+func stringPtr(s string) *string {
+	return &s
+}